From b423e6b5b597cc29ced367c8ef9182b112789508 Mon Sep 17 00:00:00 2001 From: Jakob Schneider Date: Thu, 30 Nov 2023 20:23:14 +0000 Subject: [PATCH] Fix opening the Settings page from the launcher. Bug: 309107861 Test: Tested the bugfix manually Change-Id: I40e05d0b6fc22a432895490bc51531a0eb3190ac --- .../android/settings/applications/AppInfoBase.java | 12 ++++++++---- .../appinfo/AppInfoDashboardFragment.java | 10 ++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java index 6f8597e0c4d..2c41be4ad41 100644 --- a/src/com/android/settings/applications/AppInfoBase.java +++ b/src/com/android/settings/applications/AppInfoBase.java @@ -144,10 +144,14 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment if (mAppEntry != null) { // Get application info again to refresh changed properties of application try { - mPackageInfo = mPm.getPackageInfoAsUser(mAppEntry.info.packageName, - PackageManager.MATCH_DISABLED_COMPONENTS | - PackageManager.GET_SIGNING_CERTIFICATES | - PackageManager.GET_PERMISSIONS, mUserId); + mPackageInfo = mPm.getPackageInfoAsUser( + mAppEntry.info.packageName, + PackageManager.PackageInfoFlags.of( + PackageManager.MATCH_DISABLED_COMPONENTS + | PackageManager.GET_SIGNING_CERTIFICATES + | PackageManager.GET_PERMISSIONS + | PackageManager.MATCH_ARCHIVED_PACKAGES), + mUserId); } catch (NameNotFoundException e) { Log.e(TAG, "Exception when retrieving package:" + mAppEntry.info.packageName, e); } diff --git a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java index e771ff47761..82d55f3d9f8 100644 --- a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java +++ b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java @@ -731,10 +731,12 @@ public class AppInfoDashboardFragment extends DashboardFragment try { mPackageInfo = activity.getPackageManager().getPackageInfo( mAppEntry.info.packageName, - PackageManager.MATCH_DISABLED_COMPONENTS | - PackageManager.MATCH_ANY_USER | - PackageManager.GET_SIGNATURES | - PackageManager.GET_PERMISSIONS); + PackageManager.PackageInfoFlags.of( + PackageManager.MATCH_DISABLED_COMPONENTS + | PackageManager.MATCH_ANY_USER + | PackageManager.GET_SIGNATURES + | PackageManager.GET_PERMISSIONS + | PackageManager.MATCH_ARCHIVED_PACKAGES)); } catch (NameNotFoundException e) { Log.e(TAG, "Exception when retrieving package:" + mAppEntry.info.packageName, e); }