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

Merge changes from topic "presubmit-am-4af7c72a3ef84c01ade42047ba306467" into tm-mainline-prod

Browse Source 
* changes:
  [automerge] device policy: ignore unknown permission in setPermissionGrantState 2p: d71c0ce305
  device policy: ignore unknown permission in setPermissionGrantState
This commit is contained in:
Rubin Xu
2022-03-25 10:12:43 +00:00
committed by Android (Google) Code Review
parent 367f743e66 04e70d1b0b
commit d225bc58f1
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -13985,16 +13985,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
return; return;
} }
} }
try { if (!isRuntimePermission(permission)) {
if (!isRuntimePermission(permission)) { callback.sendResult(null);
callback.sendResult(null); return;
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 if (grantState == DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED
|| grantState == DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED || grantState == DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED
|| grantState == DevicePolicyManager.PERMISSION_GRANT_STATE_DEFAULT) { || grantState == DevicePolicyManager.PERMISSION_GRANT_STATE_DEFAULT) {
@@ -14107,11 +14101,15 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}); });
} }
public boolean isRuntimePermission(String permissionName) throws NameNotFoundException { private boolean isRuntimePermission(String permissionName) {
final PackageManager packageManager = mInjector.getPackageManager(); try {
PermissionInfo permissionInfo = packageManager.getPermissionInfo(permissionName, 0); final PackageManager packageManager = mInjector.getPackageManager();
return (permissionInfo.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE) PermissionInfo permissionInfo = packageManager.getPermissionInfo(permissionName, 0);
== PermissionInfo.PROTECTION_DANGEROUS; return (permissionInfo.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE)
== PermissionInfo.PROTECTION_DANGEROUS;
} catch (NameNotFoundException e) {
return false;
}
} }
@Override @Override