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

Merge "Filter package visibility in checkExistsAndEnforceCannotModifyImmutablyRestrictedPermission()." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-08-19 18:05:35 +00:00
committed by Android (Google) Code Review
parent e77889cb61 e191ca0a7c
commit 4c2c1530bf
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1215,6 +1215,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
private boolean checkExistsAndEnforceCannotModifyImmutablyRestrictedPermission( private boolean checkExistsAndEnforceCannotModifyImmutablyRestrictedPermission(
@NonNull String permName) { @NonNull String permName) {
final String permissionPackageName;
final boolean isImmutablyRestrictedPermission; final boolean isImmutablyRestrictedPermission;
synchronized (mLock) { synchronized (mLock) {
final Permission bp = mRegistry.getPermission(permName); final Permission bp = mRegistry.getPermission(permName);
@@ -1222,15 +1223,25 @@ public class PermissionManagerService extends IPermissionManager.Stub {
Slog.w(TAG, "No such permissions: " + permName); Slog.w(TAG, "No such permissions: " + permName);
return false; return false;
} }
permissionPackageName = bp.getPackageName();
isImmutablyRestrictedPermission = bp.isHardOrSoftRestricted() isImmutablyRestrictedPermission = bp.isHardOrSoftRestricted()
&& bp.isImmutablyRestricted(); && bp.isImmutablyRestricted();
} }
final int callingUid = getCallingUid();
final int callingUserId = UserHandle.getUserId(callingUid);
if (mPackageManagerInt.filterAppAccess(permissionPackageName, callingUid, callingUserId)) {
EventLog.writeEvent(0x534e4554, "186404356", callingUid, permName);
return false;
}
if (isImmutablyRestrictedPermission && mContext.checkCallingOrSelfPermission( if (isImmutablyRestrictedPermission && mContext.checkCallingOrSelfPermission(
Manifest.permission.WHITELIST_RESTRICTED_PERMISSIONS) Manifest.permission.WHITELIST_RESTRICTED_PERMISSIONS)
!= PackageManager.PERMISSION_GRANTED) { != PackageManager.PERMISSION_GRANTED) {
throw new SecurityException("Cannot modify allowlisting of an immutably " throw new SecurityException("Cannot modify allowlisting of an immutably "
+ "restricted permission: " + permName); + "restricted permission: " + permName);
} }
return true; return true;
} }