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

Commit 6d46d7f1 authored by Chris Sabotta's avatar Chris Sabotta Committed by Automerger Merge Worker
Browse files

Revert "RESTRICT AUTOMERGE Validate permission tree size on perm..." am: b3fea7d1 

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



Change-Id: I141273c1d5ab00c89e9a14a054b98ea6ce0ab62c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 19a62f65 b3fea7d1

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);

            enforcePermissionCapLocked(info, tree);

            if (added) {

                enforcePermissionCapLocked(info, tree);

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

                        BasePermission.TYPE_DYNAMIC);

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