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

Commit 195e0556 authored by Antonio Kantek's avatar Antonio Kantek
Browse files

Fix applyImeVisibility usage in IMMS 

Changelist `I2d263efe0b26212e3d4b593db7ccc973972fca39` forces
any caller of applyImeVisibility to pass the userId.

This CL ensures that all callers are now passing the userId.

Fix: 349907598
Test: atest CtsInputMethodTestCases
Test: atest --host FrameworksInputMethodSystemServerTestsRavenwood
Flag: EXEMPT bug fix
Change-Id: Ie53676cf4353317984c0c29a53ed657830144856
parent 0356921e

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

+4 −3
Original line number Diff line number Diff line
@@ -3940,7 +3940,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
            }

            final var statsToken = createStatsTokenForFocusedClient(isShow, imeVisRes.getReason());

            mVisibilityApplier.applyImeVisibility(mImeBindingState.mFocusedWindow, statsToken,

                    imeVisRes.getState(), imeVisRes.getReason());

                    imeVisRes.getState(), imeVisRes.getReason(), bindingController.mUserId);

            if (imeVisRes.getReason() == SoftInputShowHideReason.HIDE_UNSPECIFIED_WINDOW) {

                // If focused display changed, we should unbind current method

                // to make app window in previous display relayout after Ime
@@ -4828,7 +4828,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
            @NonNull ImeVisibilityResult result) {

        synchronized (ImfLock.class) {

            mVisibilityApplier.applyImeVisibility(windowToken, statsToken, result.getState(),

                    result.getReason());

                    result.getReason(), mCurrentUserId);

        }

    }
@@ -5112,7 +5112,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
                if (imeVisRes != null) {

                    // Pass in a null statsToken as the IME snapshot is not tracked by ImeTracker.

                    mVisibilityApplier.applyImeVisibility(mImeBindingState.mFocusedWindow,

                            null /* statsToken */, imeVisRes.getState(), imeVisRes.getReason());

                            null /* statsToken */, imeVisRes.getState(), imeVisRes.getReason(),

                            mCurrentUserId);

                }

                // Eligible IME processes use new "setInteractive" protocol.

                mCurClient.mClient.setInteractive(mIsInteractive, mInFullscreenMode);