Merge "device policy: ignore unknown permission in setPermissionGrantState" into tm-dev (498f7bf2) · Commits · e / os / android_frameworks_base

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+12 −14

Original line number	Diff line number	Diff line
		@@ -13986,16 +13986,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		return;
		}
		}
		try {
		if (!isRuntimePermission(permission)) {
		callback.sendResult(null);
		return;
		}
		} catch (NameNotFoundException e) {
		throw new RemoteException("Cannot check if " + permission
		+ "is a runtime permission", e, false, true);
		}

		if (grantState == DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED
		\|\| grantState == DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED
		\|\| grantState == DevicePolicyManager.PERMISSION_GRANT_STATE_DEFAULT) {
		@@ -14108,11 +14102,15 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		});
		}

		public boolean isRuntimePermission(String permissionName) throws NameNotFoundException {
		private boolean isRuntimePermission(String permissionName) {
		try {
		final PackageManager packageManager = mInjector.getPackageManager();
		PermissionInfo permissionInfo = packageManager.getPermissionInfo(permissionName, 0);
		return (permissionInfo.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE)
		== PermissionInfo.PROTECTION_DANGEROUS;
		} catch (NameNotFoundException e) {
		return false;
		}
		}

		@Override