diff options
| author | Mike Achtelik <mike.achtelik@gmail.com> | 2020-07-21 15:32:19 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-08-28 22:18:57 +0000 |
| commit | 252d123d43af38009f99d1f3543459083c809b93 (patch) | |
| tree | 933191ba1b79afbea2b1b7de257b0721d1902a1b /src/android/jar/src | |
| parent | 1070dbf3e5aaf782cb369a74758b156bffd0a849 (diff) | |
Use ApplicationInfo to get metaData
Since the load*Libraries functions might also be invoked when using an android service,
where no activity is present, we can't rely on the activity to get the metaData.
Change-Id: I493c68591dbcfbe3063971cfd9ab384df71d03d7
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 6e7b750791eca9f7502d50ca320a48ad6bcca0d9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/android/jar/src')
| -rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtNative.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java index fa0c0de12a..7f783a0e93 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java @@ -54,7 +54,7 @@ import android.content.Context; import android.content.ContentResolver; import android.content.Intent; import android.content.pm.PackageManager; -import android.content.pm.ActivityInfo; +import android.content.pm.ApplicationInfo; import android.content.UriPermission; import android.net.Uri; import android.os.Build; @@ -446,8 +446,8 @@ public class QtNative if (!f.exists()) { Log.i(QtTAG, "Can't find '" + f.getAbsolutePath()); try { - ActivityInfo info = m_activity.getPackageManager().getActivityInfo(m_activity.getComponentName(), - PackageManager.GET_META_DATA); + ApplicationInfo info = getContext().getApplicationContext().getPackageManager() + .getApplicationInfo(getContext().getPackageName(), PackageManager.GET_META_DATA); String systemLibraryDir = QtNativeLibrariesDir.systemLibrariesDir; if (info.metaData.containsKey("android.app.system_libs_prefix")) systemLibraryDir = info.metaData.getString("android.app.system_libs_prefix"); @@ -480,8 +480,8 @@ public class QtNative File f = new File(nativeLibraryDir + mainLibNameTemplate); if (!f.exists()) { try { - ActivityInfo info = m_activity.getPackageManager().getActivityInfo(m_activity.getComponentName(), - PackageManager.GET_META_DATA); + ApplicationInfo info = getContext().getApplicationContext().getPackageManager() + .getApplicationInfo(getContext().getPackageName(), PackageManager.GET_META_DATA); String systemLibraryDir = QtNativeLibrariesDir.systemLibrariesDir; if (info.metaData.containsKey("android.app.system_libs_prefix")) systemLibraryDir = info.metaData.getString("android.app.system_libs_prefix"); |