Merge "Fix opening the Settings page from the launcher." into main

This commit is contained in:
Jakob Schneider
2023-12-05 10:20:01 +00:00
committed by Android (Google) Code Review
2 changed files with 14 additions and 8 deletions

View File

@@ -144,10 +144,14 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
if (mAppEntry != null) { if (mAppEntry != null) {
// Get application info again to refresh changed properties of application // Get application info again to refresh changed properties of application
try { try {
mPackageInfo = mPm.getPackageInfoAsUser(mAppEntry.info.packageName, mPackageInfo = mPm.getPackageInfoAsUser(
PackageManager.MATCH_DISABLED_COMPONENTS | mAppEntry.info.packageName,
PackageManager.GET_SIGNING_CERTIFICATES | PackageManager.PackageInfoFlags.of(
PackageManager.GET_PERMISSIONS, mUserId); PackageManager.MATCH_DISABLED_COMPONENTS
| PackageManager.GET_SIGNING_CERTIFICATES
| PackageManager.GET_PERMISSIONS
| PackageManager.MATCH_ARCHIVED_PACKAGES),
mUserId);
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {
Log.e(TAG, "Exception when retrieving package:" + mAppEntry.info.packageName, e); Log.e(TAG, "Exception when retrieving package:" + mAppEntry.info.packageName, e);
} }

View File

@@ -731,10 +731,12 @@ public class AppInfoDashboardFragment extends DashboardFragment
try { try {
mPackageInfo = activity.getPackageManager().getPackageInfo( mPackageInfo = activity.getPackageManager().getPackageInfo(
mAppEntry.info.packageName, mAppEntry.info.packageName,
PackageManager.MATCH_DISABLED_COMPONENTS | PackageManager.PackageInfoFlags.of(
PackageManager.MATCH_ANY_USER | PackageManager.MATCH_DISABLED_COMPONENTS
PackageManager.GET_SIGNATURES | | PackageManager.MATCH_ANY_USER
PackageManager.GET_PERMISSIONS); | PackageManager.GET_SIGNATURES
| PackageManager.GET_PERMISSIONS
| PackageManager.MATCH_ARCHIVED_PACKAGES));
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {
Log.e(TAG, "Exception when retrieving package:" + mAppEntry.info.packageName, e); Log.e(TAG, "Exception when retrieving package:" + mAppEntry.info.packageName, e);
} }