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

Merge changes from topic "permTree-sc-dev" into sc-qpr1-dev

Browse Source 
* changes:
  [automerge] RESTRICT AUTOMERGE Validate permission tree size on permission update 2p: 1d86c8b299
  RESTRICT AUTOMERGE Validate permission tree size on permission update
This commit is contained in:
Nate Myren
2022-10-25 16:27:22 +00:00
committed by Android (Google) Code Review
parent 84b3aebcd3 23e6363be7
commit 45647e1d4d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -657,8 +657,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
Permission bp = mRegistry.getPermission(info.name); Permission bp = mRegistry.getPermission(info.name);
added = bp == null; added = bp == null;
int fixedLevel = PermissionInfo.fixProtectionLevel(info.protectionLevel); int fixedLevel = PermissionInfo.fixProtectionLevel(info.protectionLevel);
if (added) {
enforcePermissionCapLocked(info, tree); enforcePermissionCapLocked(info, tree);
if (added) {
bp = new Permission(info.name, tree.getPackageName(), Permission.TYPE_DYNAMIC); bp = new Permission(info.name, tree.getPackageName(), Permission.TYPE_DYNAMIC);
} else if (!bp.isDynamic()) { } else if (!bp.isDynamic()) {
throw new SecurityException("Not allowed to modify non-dynamic permission " throw new SecurityException("Not allowed to modify non-dynamic permission "