[automerge] RESTRICT AUTOMERGE Validate permission tree size on permission update 2p: 1d86c8b299

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

Bug: 242537498
Change-Id: Ie9f764994b11ad216071d328f5ed01260b8046f5
This commit is contained in:
Presubmit Automerger Backend
2022-10-19 21:16:23 +00:00

View File

@@ -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 "