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

Commit 3ac79ce4 authored by Eric Sandness's avatar Eric Sandness Committed by android-build-merger
Browse files

Merge "Permission Check For DPM Get IME API" into pi-dev am: 78931a0f 

am: b2fed746

Change-Id: Iedb0ecaff232204c0b75817d2f37a9247e33d6b2
parents fef9ed59 b2fed746

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