Merge "Honor app visibility for checkAutoRevokeAccess" (fe4560cd) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+6 −7

Original line number	Original line	Diff line number	Diff line
	@@ -277,10 +277,6 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	}		}

	private boolean checkAutoRevokeAccess(AndroidPackage pkg, int callingUid) {		private boolean checkAutoRevokeAccess(AndroidPackage pkg, int callingUid) {
	if (pkg == null) {
	return false;
	}

	final boolean isCallerPrivileged = mContext.checkCallingOrSelfPermission(		final boolean isCallerPrivileged = mContext.checkCallingOrSelfPermission(
	Manifest.permission.WHITELIST_AUTO_REVOKE_PERMISSIONS)		Manifest.permission.WHITELIST_AUTO_REVOKE_PERMISSIONS)
	== PackageManager.PERMISSION_GRANTED;		== PackageManager.PERMISSION_GRANTED;
	@@ -292,6 +288,12 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	+ Manifest.permission.WHITELIST_AUTO_REVOKE_PERMISSIONS		+ Manifest.permission.WHITELIST_AUTO_REVOKE_PERMISSIONS
	+ " or be the installer on record");		+ " or be the installer on record");
	}		}

			if (pkg == null \|\| mPackageManagerInt.filterAppAccess(pkg, callingUid,
			UserHandle.getUserId(callingUid))) {
			return false;
			}

	return true;		return true;
	}		}

	@@ -301,9 +303,6 @@ public class PermissionManagerService extends IPermissionManager.Stub {

	final AndroidPackage pkg = mPackageManagerInt.getPackage(packageName);		final AndroidPackage pkg = mPackageManagerInt.getPackage(packageName);
	final int callingUid = Binder.getCallingUid();		final int callingUid = Binder.getCallingUid();
	if (mPackageManagerInt.filterAppAccess(packageName, callingUid, userId)) {
	return false;
	}

	if (!checkAutoRevokeAccess(pkg, callingUid)) {		if (!checkAutoRevokeAccess(pkg, callingUid)) {
	return false;		return false;