Merge "Handle install time ephemeral permissions" into oc-dev am: dc89202d1a (2bde7ae4) · Commits · e / os / android_frameworks_base

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

+18 −2

Original line number	Diff line number	Diff line
		@@ -4853,10 +4853,18 @@ public class PackageManagerService extends IPackageManager.Stub
		if (filterAppAccessLPr(ps, callingUid, userId)) {
		return PackageManager.PERMISSION_DENIED;
		}
		final boolean instantApp = ps.getInstantApp(userId);
		final PermissionsState permissionsState = ps.getPermissionsState();
		if (permissionsState.hasPermission(permName, userId)) {
		if (instantApp) {
		BasePermission bp = mSettings.mPermissions.get(permName);
		if (bp != null && bp.isInstant()) {
		return PackageManager.PERMISSION_GRANTED;
		}
		} else {
		return PackageManager.PERMISSION_GRANTED;
		}
		}
		// Special case: ACCESS_FINE_LOCATION permission includes ACCESS_COARSE_LOCATION
		if (Manifest.permission.ACCESS_COARSE_LOCATION.equals(permName) && permissionsState
		.hasPermission(Manifest.permission.ACCESS_FINE_LOCATION, userId)) {
		@@ -4873,6 +4881,7 @@ public class PackageManagerService extends IPackageManager.Stub
		final int callingUid = Binder.getCallingUid();
		final int callingUserId = UserHandle.getUserId(callingUid);
		final boolean isCallerInstantApp = getInstantAppPackageName(callingUid) != null;
		final boolean isUidInstantApp = getInstantAppPackageName(uid) != null;
		final int userId = UserHandle.getUserId(uid);
		if (!sUserManager.exists(userId)) {
		return PackageManager.PERMISSION_DENIED;
		@@ -4894,8 +4903,15 @@ public class PackageManagerService extends IPackageManager.Stub
		final SettingBase settingBase = (SettingBase) obj;
		final PermissionsState permissionsState = settingBase.getPermissionsState();
		if (permissionsState.hasPermission(permName, userId)) {
		if (isUidInstantApp) {
		BasePermission bp = mSettings.mPermissions.get(permName);
		if (bp != null && bp.isInstant()) {
		return PackageManager.PERMISSION_GRANTED;
		}
		} else {
		return PackageManager.PERMISSION_GRANTED;
		}
		}
		// Special case: ACCESS_FINE_LOCATION permission includes ACCESS_COARSE_LOCATION
		if (Manifest.permission.ACCESS_COARSE_LOCATION.equals(permName) && permissionsState
		.hasPermission(Manifest.permission.ACCESS_FINE_LOCATION, userId)) {