Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into rvc-dev

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

@@ -610,8 +610,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
             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()) {