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

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

Merge "Validate permission tree size on permission update"

parents 22dbd320 11c306e3

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

+1 −1
Original line number Diff line number Diff line
@@ -649,8 +649,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 
            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 "