Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RESTRICT AUTOMERGE Validate permission tree size on permission update am: 8fdf4530aa

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

Change-Id: If830fb0f3d226c0a5589ae52181e4398196d66a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nate Myren
2022-10-25 18:31:23 +00:00
committed by Automerger Merge Worker
parent cf56315da1 8fdf4530aa
commit fa709cdfb4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/permission/PermissionManagerService.java
View File

@@ -610,8 +610,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
BasePermission bp = mSettings.getPermissionLocked(info.name); BasePermission bp = mSettings.getPermissionLocked(info.name);
added = bp == null; added = bp == null;
int fixedLevel = PermissionInfo.fixProtectionLevel(info.protectionLevel); int fixedLevel = PermissionInfo.fixProtectionLevel(info.protectionLevel);
if (added) {
enforcePermissionCapLocked(info, tree); enforcePermissionCapLocked(info, tree);
if (added) {
bp = new BasePermission(info.name, tree.getSourcePackageName(), bp = new BasePermission(info.name, tree.getSourcePackageName(),
BasePermission.TYPE_DYNAMIC); BasePermission.TYPE_DYNAMIC);
} else if (!bp.isDynamic()) { } else if (!bp.isDynamic()) {