RESTRICT AUTOMERGE Validate permission tree size on permission update

Bug: 242537498
Test: manual
Change-Id: I15343e84c1802d6b89249106263319a6539fa73b
Merged-In: I15343e84c1802d6b89249106263319a6539fa73b
This commit is contained in:
Nate Myren
2022-09-22 15:23:24 -07:00
parent 2663e8aa43
commit ce6ae95066

View File

@@ -942,8 +942,8 @@ public class PermissionManagerService {
BasePermission bp = mSettings.getPermissionLocked(info.name);
added = bp == null;
int fixedLevel = PermissionInfo.fixProtectionLevel(info.protectionLevel);
enforcePermissionCapLocked(info, tree);
if (added) {
enforcePermissionCapLocked(info, tree);
bp = new BasePermission(info.name, tree.getSourcePackageName(),
BasePermission.TYPE_DYNAMIC);
} else if (!bp.isDynamic()) {