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

Commit 4d96a79f 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 rvc-dev

parents 8a46d49b 8fdf4530

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

+1 −1
Original line number Diff line number Diff line
@@ -610,8 +610,8 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
            BasePermission bp = mSettings.getPermissionLocked(info.name);

            added = bp == null;

            int fixedLevel = PermissionInfo.fixProtectionLevel(info.protectionLevel);

            if (added) {

            enforcePermissionCapLocked(info, tree);

            if (added) {

                bp = new BasePermission(info.name, tree.getSourcePackageName(),

                        BasePermission.TYPE_DYNAMIC);

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