Merge "Fix opening the Settings page from the launcher." into main (29941919) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/applications/AppInfoBase.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -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);
		}

+6 −4

Original line number	Diff line number	Diff line
		@@ -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);
		}