Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into sc-v2-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
f107f9a223
@@ -657,8 +657,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
|
||||
Permission bp = mRegistry.getPermission(info.name);
|
||||
added = bp == null;
|
||||
int fixedLevel = PermissionInfo.fixProtectionLevel(info.protectionLevel);
|
||||
enforcePermissionCapLocked(info, tree);
|
||||
if (added) {
|
||||
enforcePermissionCapLocked(info, tree);
|
||||
bp = new Permission(info.name, tree.getPackageName(), Permission.TYPE_DYNAMIC);
|
||||
} else if (!bp.isDynamic()) {
|
||||
throw new SecurityException("Not allowed to modify non-dynamic permission "
|
||||
|
||||
Reference in New Issue
Block a user