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

Commit 06892efb authored by Cosmin Băieș's avatar Cosmin Băieș Committed by Android (Google) Code Review
Browse files

Merge "Fix orientation change race conditions in IME test" into main

parents 02814a06 fbcfb86b

services/tests/InputMethodSystemServerTests/src/com/android/inputmethodservice/InputMethodServiceTest.java

+4 −2
Original line number Diff line number Diff line
@@ -144,10 +144,9 @@ public class InputMethodServiceTest { 
        if (!mOriginalVerboseImeTrackerLoggingEnabled) {

            setVerboseImeTrackerLogging(true);

        }

        mUiDevice.setOrientationNatural();

        prepareIme();

        prepareActivity();

        mUiDevice.freezeRotation();

        mUiDevice.setOrientationNatural();

        // Waits for input binding ready.

        eventually(() -> {

            mInputMethodService = InputMethodServiceWrapper.getInstance();
@@ -174,6 +173,9 @@ public class InputMethodServiceTest { 


    @After

    public void tearDown() throws Exception {

        if (!mUiDevice.isNaturalOrientation()) {

            mUiDevice.setOrientationNatural();

        }

        mUiDevice.unfreezeRotation();

        if (!mOriginalVerboseImeTrackerLoggingEnabled) {

            setVerboseImeTrackerLogging(false);