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

Revert "RESTRICT AUTOMERGE Validate permission tree size on perm..."

Browse Source 
Revert submission 20103164-permTree-qt-dev

Reason for revert: build breakage b/255661858
Reverted Changes:
I15343e84c:RESTRICT AUTOMERGE Validate permission tree size o...
If16ecb7be:RESTRICT AUTOMERGE Add PermissionMemoryFootprintTe...

Change-Id: I4e8ec8b1a609d0e7a6bb379579014c82a9825101
This commit is contained in:
Chris Sabotta
2022-10-26 00:49:58 +00:00
parent ce6ae95066
commit b3fea7d1a8
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);
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()) {