am f357c962: Merge "Prevent modification of system fixed permissions" into mnc-dev (4f329b68) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerService.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -3183,6 +3183,12 @@ public class PackageManagerService extends IPackageManager.Stub {

		final PermissionsState permissionsState = sb.getPermissionsState();

		final int flags = permissionsState.getPermissionFlags(name, userId);
		if ((flags & PackageManager.FLAG_PERMISSION_SYSTEM_FIXED) != 0) {
		throw new SecurityException("Cannot grant system fixed permission: "
		+ name + " for package: " + packageName);
		}

		final int result = permissionsState.grantRuntimePermission(bp, userId);
		switch (result) {
		case PermissionsState.PERMISSION_OPERATION_FAILURE: {
		@@ -3240,6 +3246,12 @@ public class PackageManagerService extends IPackageManager.Stub {

		final PermissionsState permissionsState = sb.getPermissionsState();

		final int flags = permissionsState.getPermissionFlags(name, userId);
		if ((flags & PackageManager.FLAG_PERMISSION_SYSTEM_FIXED) != 0) {
		throw new SecurityException("Cannot revoke system fixed permission: "
		+ name + " for package: " + packageName);
		}

		if (permissionsState.revokeRuntimePermission(bp, userId) ==
		PermissionsState.PERMISSION_OPERATION_FAILURE) {
		return;