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 am: 0fc93aa28a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14792030

Change-Id: I5dc90e6140d7650b69e2dcafe595518045ca262f
This commit is contained in:
TreeHugger Robot
2021-06-01 20:25:19 +00:00
committed by Automerger Merge Worker
parent bd9b5ccd1a 0fc93aa28a
commit c3f7afe134
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;
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_WHEN_SYSTEM;
@@ -510,7 +511,7 @@ public abstract class PermissionControllerService extends Service {
String callerPackageName, AdminPermissionControlParams params,
AndroidFuture callback) {
checkStringNotEmpty(callerPackageName);
if (params.getGrantState() == PERMISSION_GRANT_STATE_DENIED) {
if (params.getGrantState() == PERMISSION_GRANT_STATE_GRANTED) {
enforceSomePermissionsGrantedToCaller(
Manifest.permission.GRANT_RUNTIME_PERMISSIONS);
}