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

Commit 88a76a8c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate... 

Merge "RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..."" into qt-dev
parents b4ac90f4 4e83e59b

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()) {