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

Merge "Fix isAutoRevokeWhitelisted vulnerability" into sc-dev am: c567ac9165

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15102869

Change-Id: I43308940cc1bc9b13624b91ed6e40556348735fc
This commit is contained in:
Jay Sullivan
2021-07-02 21:08:01 +00:00
committed by Automerger Merge Worker
parent 4623229372 c567ac9165
commit 2b1a2845d8
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 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(