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

Commit b3fea7d1 authored by Chris Sabotta's avatar Chris Sabotta
Browse files

Revert "RESTRICT AUTOMERGE Validate permission tree size on perm..." 

Revert submission 20103164-permTree-qt-dev

Reason for revert: build breakage b/255661858
Reverted Changes:
I15343e84c:RESTRICT AUTOMERGE Validate permission tree size o...
If16ecb7be:RESTRICT AUTOMERGE Add PermissionMemoryFootprintTe...

Change-Id: I4e8ec8b1a609d0e7a6bb379579014c82a9825101
parent 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);

            enforcePermissionCapLocked(info, tree);

            if (added) {

                enforcePermissionCapLocked(info, tree);

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

                        BasePermission.TYPE_DYNAMIC);

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