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

Merge "Fix wrong permission check in setRuntimePermissionGrantStateByDeviceAdminFromParams()." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-01 20:15:04 +00:00
committed by Android (Google) Code Review
parent 580476b758 032d5f1fd5
commit 0fc93aa28a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/permission/PermissionControllerService.java
View File

@@ -17,6 +17,7 @@
package android.permission; package android.permission;
import static android.app.admin.DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED; import static android.app.admin.DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED;
import static android.app.admin.DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED;
import static android.permission.PermissionControllerManager.COUNT_ONLY_WHEN_GRANTED; import static android.permission.PermissionControllerManager.COUNT_ONLY_WHEN_GRANTED;
import static android.permission.PermissionControllerManager.COUNT_WHEN_SYSTEM; import static android.permission.PermissionControllerManager.COUNT_WHEN_SYSTEM;
@@ -510,7 +511,7 @@ public abstract class PermissionControllerService extends Service {
String callerPackageName, AdminPermissionControlParams params, String callerPackageName, AdminPermissionControlParams params,
AndroidFuture callback) { AndroidFuture callback) {
checkStringNotEmpty(callerPackageName); checkStringNotEmpty(callerPackageName);
if (params.getGrantState() == PERMISSION_GRANT_STATE_DENIED) { if (params.getGrantState() == PERMISSION_GRANT_STATE_GRANTED) {
enforceSomePermissionsGrantedToCaller( enforceSomePermissionsGrantedToCaller(
Manifest.permission.GRANT_RUNTIME_PERMISSIONS); Manifest.permission.GRANT_RUNTIME_PERMISSIONS);
} }