Merge "Merge "Allow the launcher to get all instant apps" into oc-mr1-dev am:... (d97cdded) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerService.java

+8 −5

Original line number	Diff line number	Diff line
		@@ -8526,8 +8526,10 @@ public class PackageManagerService extends IPackageManager.Stub
		if (HIDE_EPHEMERAL_APIS \|\| isEphemeralDisabled()) {
		return null;
		}
		if (!canViewInstantApps(Binder.getCallingUid(), userId)) {
		mContext.enforceCallingOrSelfPermission(Manifest.permission.ACCESS_INSTANT_APPS,
		"getEphemeralApplications");
		}
		enforceCrossUserPermission(Binder.getCallingUid(), userId,
		true /* requireFullPermission /, false / checkShell */,
		"getEphemeralApplications");
		@@ -8612,9 +8614,10 @@ public class PackageManagerService extends IPackageManager.Stub
		return null;
		}

		if (!canViewInstantApps(Binder.getCallingUid(), userId)) {
		mContext.enforceCallingOrSelfPermission(Manifest.permission.ACCESS_INSTANT_APPS,
		"getInstantAppIcon");

		}
		enforceCrossUserPermission(Binder.getCallingUid(), userId,
		true /* requireFullPermission /, false / checkShell */,
		"getInstantAppIcon");