diff options
| author | 2022-10-27 02:58:01 +0000 | |
|---|---|---|
| committer | 2022-10-27 02:58:01 +0000 | |
| commit | 4734edc494e3aa762333c29b899068a140eefce7 (patch) | |
| tree | 6692fd53d6c4aa652c13260411469c0bea82e3d5 | |
| parent | c5c6a916fe84d801bdd6206f04b70bece768175a (diff) | |
| parent | 4e83e59b27f7d6232ee9fe96f789e32debc19772 (diff) | |
RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..." am: 4e83e59b27
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291140
Change-Id: I673c2f2d4929ab675cf0e1b0ba87aab29e489c86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/pm/permission/PermissionManagerService.java | 2 |
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 42ed16268919..dbe2840072d6 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()) { |