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

1 files changed, 1 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
index 8e0652f750c1..c7fca39de562 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -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()) {