Merge "Fix isAutoRevokeWhitelisted vulnerability" into sc-dev

This commit is contained in:
Jay Sullivan
2021-07-02 20:55:11 +00:00
committed by Android (Google) Code Review

View File

@@ -1384,12 +1384,16 @@ public class PermissionManagerService extends IPermissionManager.Stub {
final AndroidPackage pkg = mPackageManagerInt.getPackage(packageName);
final int callingUid = Binder.getCallingUid();
final int packageUid = UserHandle.getUid(userId, pkg.getUid());
if (mPackageManagerInt.filterAppAccess(packageName, callingUid, userId)) {
return false;
}
if (!checkAutoRevokeAccess(pkg, callingUid)) {
return false;
}
final int packageUid = UserHandle.getUid(userId, pkg.getUid());
final long identity = Binder.clearCallingIdentity();
try {
return mAppOpsManager.checkOpNoThrow(