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: 973c67f7fc

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

Change-Id: I791f0b51840d23b983551e0716bad8806e8cd044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nate Myren
2022-10-24 22:18:16 +00:00
committed by Automerger Merge Worker
parent f9db86f128 973c67f7fc
commit 5656d42578
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/PermissionManagerServiceImpl.java
View File

@@ -644,8 +644,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
Permission bp = mRegistry.getPermission(info.name); Permission bp = mRegistry.getPermission(info.name);
added = bp == null; added = bp == null;
int fixedLevel = PermissionInfo.fixProtectionLevel(info.protectionLevel); int fixedLevel = PermissionInfo.fixProtectionLevel(info.protectionLevel);
enforcePermissionCapLocked(info, tree);
if (added) { if (added) {
enforcePermissionCapLocked(info, tree);
bp = new Permission(info.name, tree.getPackageName(), Permission.TYPE_DYNAMIC); bp = new Permission(info.name, tree.getPackageName(), Permission.TYPE_DYNAMIC);
} else if (!bp.isDynamic()) { } else if (!bp.isDynamic()) {
throw new SecurityException("Not allowed to modify non-dynamic permission " throw new SecurityException("Not allowed to modify non-dynamic permission "