Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6c88ea9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix wrong permission check in... 

Merge "Fix wrong permission check in setRuntimePermissionGrantStateByDeviceAdminFromParams()." into sc-dev am: 0fc93aa2 am: c3f7afe1 am: 78f1ca6f

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

Change-Id: I502bf434c96d81a9d73325f21954bac247cc4336
parents 952c4c19 78f1ca6f

core/java/android/permission/PermissionControllerService.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

                }