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

Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into rvc-dev

Browse Source
This commit is contained in:
Nate Myren
2022-10-25 17:54:24 +00:00
committed by Android (Google) Code Review
parent 8a46d49bd4 8fdf4530aa
commit 4d96a79f54
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()) {