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

Merge "Throw a more helpful exception upon invalid split permission configuration." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-01 05:37:10 +00:00
committed by Android (Google) Code Review
parent f65792fe22 04eedff9a4
commit 410bb405b2
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/pm/permission/PermissionManagerService.java
View File

@@ -3125,6 +3125,10 @@ public class PermissionManagerService extends IPermissionManager.Stub {
if (sourcePerms != null) { if (sourcePerms != null) {
Permission bp = mRegistry.getPermission(newPerm); Permission bp = mRegistry.getPermission(newPerm);
if (bp == null) {
throw new IllegalStateException("Unknown new permission in split permission: "
+ newPerm);
}
if (bp.isRuntime()) { if (bp.isRuntime()) {
if (!newPerm.equals(Manifest.permission.ACTIVITY_RECOGNITION)) { if (!newPerm.equals(Manifest.permission.ACTIVITY_RECOGNITION)) {
@@ -3140,6 +3144,10 @@ public class PermissionManagerService extends IPermissionManager.Stub {
sourcePermNum++) { sourcePermNum++) {
final String sourcePerm = sourcePerms.valueAt(sourcePermNum); final String sourcePerm = sourcePerms.valueAt(sourcePermNum);
Permission sourceBp = mRegistry.getPermission(sourcePerm); Permission sourceBp = mRegistry.getPermission(sourcePerm);
if (sourceBp == null) {
throw new IllegalStateException("Unknown source permission in split"
+ " permission: " + sourcePerm);
}
if (!sourceBp.isRuntime()) { if (!sourceBp.isRuntime()) {
inheritsFromInstallPerm = true; inheritsFromInstallPerm = true;
break; break;