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

Commit d4596664 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: ce6ae950 

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



Change-Id: I01c1a808385e0b8e7b669d94325630f98ba679b3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8451db57 ce6ae950

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

+1 −1
Original line number Diff line number Diff line
@@ -942,8 +942,8 @@ public class PermissionManagerService { 
            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()) {