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

Merge "Revert "RESTRICT AUTOMERGE Validate permission tree size on perm..."" into qt-dev

Browse Source
This commit is contained in:
Chris Sabotta
2022-10-26 00:52:51 +00:00
committed by Android (Google) Code Review
parent 2d9de7b6ef b3fea7d1a8
commit f661f5e669
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

@@ -942,8 +942,8 @@ public class PermissionManagerService {
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);
enforcePermissionCapLocked(info, tree);
if (added) { if (added) {
enforcePermissionCapLocked(info, tree);
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()) {