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

Commit 03f0146b authored by Nate Myren's avatar Nate Myren Committed by Android (Google) Code Review
Browse files

Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into sc-dev

parents 967cdc55 1d86c8b2

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 "