Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d86c8b2 authored by Nate Myren's avatar Nate Myren
Browse files

RESTRICT AUTOMERGE Validate permission tree size on permission update 

Bug: 242537498
Test: manual
Change-Id: I15343e84c1802d6b89249106263319a6539fa73b
parent ddaa966c

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

            if (added) {

            enforcePermissionCapLocked(info, tree);

            if (added) {

                bp = new Permission(info.name, tree.getPackageName(), Permission.TYPE_DYNAMIC);

            } else if (!bp.isDynamic()) {

                throw new SecurityException("Not allowed to modify non-dynamic permission "