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

Commit 78931a0f authored by Eric Sandness's avatar Eric Sandness Committed by Android (Google) Code Review
Browse files

Merge "Permission Check For DPM Get IME API" into pi-dev

parents d598caac 57378939

core/java/android/app/admin/DevicePolicyManager.java

+1 −0
Original line number Diff line number Diff line
@@ -6359,6 +6359,7 @@ public class DevicePolicyManager { 
     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MANAGE_USERS)

    public @Nullable List<String> getPermittedInputMethodsForCurrentUser() {

        throwIfParentInstance("getPermittedInputMethodsForCurrentUser");

        if (mService != null) {

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -8738,6 +8738,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 














    @Override















    public List getPermittedInputMethodsForCurrentUser() {













        enforceManageUsers();















        UserInfo currentUser;















        try {















            currentUser = mInjector.getIActivityManager().getCurrentUser();