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

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

Merge "Allow the active IME to see the target app package" into rvc-dev am: 37fae4d7 

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

Change-Id: Ic3ab5fdd5df7ea2e684b7d9ecded5a6b820b1c78
parents c4c9f2f3 37fae4d7

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+10 −0
Original line number Original line Diff line number Diff line
@@ -2352,6 +2352,16 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
        mImeTargetWindowMap.put(startInputToken, mCurFocusedWindow);

        mImeTargetWindowMap.put(startInputToken, mCurFocusedWindow);

        mStartInputHistory.addEntry(info);

        mStartInputHistory.addEntry(info);





        // Seems that PackageManagerInternal#grantImplicitAccess() doesn't handle cross-user

        // implicit visibility (e.g. IME[user=10] -> App[user=0]) thus we do this only for the

        // same-user scenarios.

        // That said ignoring cross-user scenario will never affect IMEs that do not have

        // INTERACT_ACROSS_USERS(_FULL) permissions, which is actually almost always the case.

        if (mSettings.getCurrentUserId() == UserHandle.getUserId(mCurClient.uid)) {

            mPackageManagerInternal.grantImplicitAccess(mSettings.getCurrentUserId(),

                    null /* intent */, UserHandle.getAppId(mCurMethodUid), mCurClient.uid, true);

        }



        final SessionState session = mCurClient.curSession;

        final SessionState session = mCurClient.curSession;

        executeOrSendMessage(session.method, mCaller.obtainMessageIIOOOO(

        executeOrSendMessage(session.method, mCaller.obtainMessageIIOOOO(

                MSG_START_INPUT, mCurInputContextMissingMethods, initial ? 0 : 1 /* restarting */,

                MSG_START_INPUT, mCurInputContextMissingMethods, initial ? 0 : 1 /* restarting */,