diff options
| author | 2022-10-25 16:27:22 +0000 | |
|---|---|---|
| committer | 2022-10-25 16:27:22 +0000 | |
| commit | 03f0146b3caa70394417021458f33cb67a645ead (patch) | |
| tree | 4a76ae1a4c668d633a31e10489f930cb25cf52e1 | |
| parent | 967cdc55442c9564a044b2790bb1db90ab88abd7 (diff) | |
| parent | 1d86c8b29922525972559e00e26c1fcd6f496353 (diff) | |
Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into sc-dev
| -rw-r--r-- | services/core/java/com/android/server/pm/permission/PermissionManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java index 2662f620cbd4..d867adb961e6 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java @@ -657,8 +657,8 @@ public class PermissionManagerService extends IPermissionManager.Stub { Permission bp = mRegistry.getPermission(info.name); added = bp == null; int fixedLevel = PermissionInfo.fixProtectionLevel(info.protectionLevel); + enforcePermissionCapLocked(info, tree); if (added) { - enforcePermissionCapLocked(info, tree); bp = new Permission(info.name, tree.getPackageName(), Permission.TYPE_DYNAMIC); } else if (!bp.isDynamic()) { throw new SecurityException("Not allowed to modify non-dynamic permission " |