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

Commit e2e5ae66 authored by Antonio Kantek's avatar Antonio Kantek
Browse files

Inline IMMS#getCurMethodUidLocked 

This CL represents an internal refactoring and shouldn't introduce any
observable breakage.

Bug: 325515685
Test: atest FrameworksInputMethodSystemServerTests
Test: atest CtsInputMethodTestCases
Test: atest FrameworksServicesTests
Test: atest --host FrameworksInputMethodSystemServerTestsRavenwood
Change-Id: Ic74f40a2d63c6d744e00a1b75ce6adce8cf52b22
parent 730f47d4

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

+6 −12
Original line number Diff line number Diff line
@@ -624,15 +624,6 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
        return userData.mBindingController.getCurMethod();

    }



    /**

     * If not {@link Process#INVALID_UID}, then the UID of {@link #getCurIntentLocked()}.

     */

    @GuardedBy("ImfLock.class")

    private int getCurMethodUidLocked() {

        final var userData = mUserDataRepository.getOrCreate(mCurrentUserId);

        return userData.mBindingController.getCurMethodUid();

    }



    /**

     * Have we called mCurMethod.bindInput()?

     */
@@ -2034,8 +2025,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
        // INTERACT_ACROSS_USERS(_FULL) permissions, which is actually almost always the case.

        if (mCurrentUserId == UserHandle.getUserId(

                mCurClient.mUid)) {

            mPackageManagerInternal.grantImplicitAccess(mCurrentUserId,

                    null /* intent */, UserHandle.getAppId(getCurMethodUidLocked()),

            mPackageManagerInternal.grantImplicitAccess(mCurrentUserId, null /* intent */,

                    UserHandle.getAppId(userData.mBindingController.getCurMethodUid()),

                    mCurClient.mUid, true /* direct */);

        }
@@ -4908,7 +4899,10 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
            if (mCurClient == null || mCurClient.mClient == null) {

                return;

            }

            if (mImePlatformCompatUtils.shouldUseSetInteractiveProtocol(getCurMethodUidLocked())) {

            // TODO(b/325515685): user data must be retrieved by a userId parameter

            final var userData = mUserDataRepository.getOrCreate(mCurrentUserId);

            if (mImePlatformCompatUtils.shouldUseSetInteractiveProtocol(

                    userData.mBindingController.getCurMethodUid())) {

                // Handle IME visibility when interactive changed before finishing the input to

                // ensure we preserve the last state as possible.

                final ImeVisibilityResult imeVisRes = mVisibilityStateComputer.onInteractiveChanged(