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

Commit f661f5e6 authored by Chris Sabotta's avatar Chris Sabotta Committed by Android (Google) Code Review
Browse files

Merge "Revert "RESTRICT AUTOMERGE Validate permission tree size on perm..."" into qt-dev

parents 2d9de7b6 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()) {