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

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

Merge changes from topic "permTree-sc-dev" into sc-qpr1-dev 

* changes:
  [automerge] RESTRICT AUTOMERGE Validate permission tree size on permission update 2p: 1d86c8b2
  RESTRICT AUTOMERGE Validate permission tree size on permission update
parents 84b3aebc 23e6363b

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 "