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

Commit bd6d8e69 authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Automerger Merge Worker
Browse files

Merge "Fix: Security exception in case of work profile" into udc-dev am: cc10548a 

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



Change-Id: I0a178d875174134774d2e48f25c7532ac9c0b846
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 03784698 cc10548a

services/core/java/com/android/server/input/KeyboardLayoutManager.java

+8 −1
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ import com.android.internal.inputmethod.InputMethodSubtypeHandle; 
import com.android.internal.messages.nano.SystemMessageProto;

import com.android.internal.notification.SystemNotificationChannels;

import com.android.internal.util.XmlUtils;

import com.android.server.inputmethod.InputMethodManagerInternal;



import libcore.io.Streams;
@@ -1226,9 +1227,15 @@ final class KeyboardLayoutManager implements InputManager.InputDeviceListener { 
                mContext.getSystemService(UserManager.class));

        InputMethodManager inputMethodManager = Objects.requireNonNull(

                mContext.getSystemService(InputMethodManager.class));

        // Need to use InputMethodManagerInternal to call getEnabledInputMethodListAsUser()

        // instead of using InputMethodManager which uses enforceCallingPermissions() that

        // breaks when we are calling the method for work profile user ID since it doesn't check

        // self permissions.

        InputMethodManagerInternal inputMethodManagerInternal = InputMethodManagerInternal.get();

        for (UserHandle userHandle : userManager.getUserHandles(true /* excludeDying */)) {

            int userId = userHandle.getIdentifier();

            for (InputMethodInfo imeInfo : inputMethodManager.getEnabledInputMethodListAsUser(

            for (InputMethodInfo imeInfo :

                    inputMethodManagerInternal.getEnabledInputMethodListAsUser(

                    userId)) {

                for (InputMethodSubtype imeSubtype :

                        inputMethodManager.getEnabledInputMethodSubtypeList(