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

Commit 850a834c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Inline IMMS#queryInputMethodForCurrentUserLocked()" into main

parents 92a51cac eefbb727

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

+0 −7
Original line number Diff line number Diff line
@@ -497,13 +497,6 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
        return getUserData(userId).mBindingController;

    }





    @GuardedBy("ImfLock.class")

    @Nullable

    InputMethodInfo queryInputMethodForCurrentUserLocked(@NonNull String imeId) {

        return InputMethodSettingsRepository.get(mCurrentUserId).getMethodMap().get(imeId);

    }



    /**

     * The last window token that we confirmed that IME started talking to.  This is always updated

     * upon reports from the input method.  If the window state is already changed before the report

services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodBindingControllerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -140,7 +140,8 @@ public class InputMethodBindingControllerTest extends InputMethodManagerServiceT 
        final InputMethodInfo info;

        synchronized (ImfLock.class) {

            mBindingController.setSelectedMethodId(TEST_IME_ID);

            info = mInputMethodManagerService.queryInputMethodForCurrentUserLocked(TEST_IME_ID);

            info = InputMethodSettingsRepository.get(mCallingUserId).getMethodMap()

                    .get(TEST_IME_ID);

        }

        assertThat(info).isNotNull();

        assertThat(info.getId()).isEqualTo(TEST_IME_ID);