Revert "RESTRICT AUTOMERGE Validate permission tree size on perm..." am: b3fea7d1a8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20285708

Change-Id: I141273c1d5ab00c89e9a14a054b98ea6ce0ab62c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chris Sabotta
2022-10-26 01:32:37 +00:00
committed by Automerger Merge Worker

View File

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