Merge "Throw a more helpful exception upon invalid split permission configuration." into sc-dev (410bb405) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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;