Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1127384 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Throw a more helpful exception upon invalid split permission... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14056765

Change-Id: I4d10bc4ff0c847e7d2a5b762b61fba34c6dae022
parents fb6d91c9 410bb405

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+8 −0
Original line number Diff line number Diff line
@@ -3125,6 +3125,10 @@ public class PermissionManagerService extends IPermissionManager.Stub { 


            if (sourcePerms != null) {

                Permission bp = mRegistry.getPermission(newPerm);

                if (bp == null) {

                    throw new IllegalStateException("Unknown new permission in split permission: "

                            + newPerm);

                }

                if (bp.isRuntime()) {



                    if (!newPerm.equals(Manifest.permission.ACTIVITY_RECOGNITION)) {
@@ -3140,6 +3144,10 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
                                sourcePermNum++) {

                            final String sourcePerm = sourcePerms.valueAt(sourcePermNum);

                            Permission sourceBp = mRegistry.getPermission(sourcePerm);

                            if (sourceBp == null) {

                                throw new IllegalStateException("Unknown source permission in split"

                                        + " permission: " + sourcePerm);

                            }

                            if (!sourceBp.isRuntime()) {

                                inheritsFromInstallPerm = true;

                                break;