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

Commit fa709cdf authored by Nate Myren's avatar Nate Myren Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE Validate permission tree size on permission update am: 8fdf4530 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20030687



Change-Id: If830fb0f3d226c0a5589ae52181e4398196d66a1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf56315d 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()) {