Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix isAutoRevokeWhitelisted vulnerability" into sc-dev

Browse Source
This commit is contained in:
Jay Sullivan
2021-07-02 20:55:11 +00:00
committed by Android (Google) Code Review
parent 9b1891b428 287e22a904
commit c567ac9165
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/permission/PermissionManagerService.java
View File

@@ -1384,12 +1384,16 @@ 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();
final int packageUid = UserHandle.getUid(userId, pkg.getUid()); if (mPackageManagerInt.filterAppAccess(packageName, callingUid, userId)) {
return false;
}
if (!checkAutoRevokeAccess(pkg, callingUid)) { if (!checkAutoRevokeAccess(pkg, callingUid)) {
return false; return false;
} }
final int packageUid = UserHandle.getUid(userId, pkg.getUid());
final long identity = Binder.clearCallingIdentity(); final long identity = Binder.clearCallingIdentity();
try { try {
return mAppOpsManager.checkOpNoThrow( return mAppOpsManager.checkOpNoThrow(