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

Commit 032d5f1f authored by Hai Zhang's avatar Hai Zhang
Browse files

Fix wrong permission check in 

setRuntimePermissionGrantStateByDeviceAdminFromParams().

This is nice to have, but not necessarily a security fix because we are
already always enforcing ADJUST_RUNTIME_PERMISSIONS_POLICY.

Bug: 158735247
Test: presubmit
Change-Id: I629969e04e1d5e7e3ef47c8833780f19d83b9e0b
parent 69660aaf

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);

                }