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

Merge "Honor app visibility for checkAutoRevokeAccess"

Browse Source
This commit is contained in:
Jackal Guo
2022-03-15 05:47:37 +00:00
committed by Android (Google) Code Review
parent 3914cc7e02 b7f680c346
commit fe4560cd72
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -277,10 +277,6 @@ public class PermissionManagerService extends IPermissionManager.Stub {
}
private boolean checkAutoRevokeAccess(AndroidPackage pkg, int callingUid) {
if (pkg == null) {
return false;
}
final boolean isCallerPrivileged = mContext.checkCallingOrSelfPermission(
Manifest.permission.WHITELIST_AUTO_REVOKE_PERMISSIONS)
== PackageManager.PERMISSION_GRANTED;
@@ -292,6 +288,12 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+ Manifest.permission.WHITELIST_AUTO_REVOKE_PERMISSIONS
+ " or be the installer on record");
}
if (pkg == null || mPackageManagerInt.filterAppAccess(pkg, callingUid,
UserHandle.getUserId(callingUid))) {
return false;
}
return true;
}
@@ -301,9 +303,6 @@ public class PermissionManagerService extends IPermissionManager.Stub {
final AndroidPackage pkg = mPackageManagerInt.getPackage(packageName);
final int callingUid = Binder.getCallingUid();
if (mPackageManagerInt.filterAppAccess(packageName, callingUid, userId)) {
return false;
}
if (!checkAutoRevokeAccess(pkg, callingUid)) {
return false;