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

Commit e5c151fd authored by Taran Singh's avatar Taran Singh Committed by Automerger Merge Worker
Browse files

Merge "Dont finish handwriting inking was prepared for session" into udc-qpr-dev am: f3b13f10 

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



Change-Id: If0d4b96c4b2b4a737a2d882f51849beca846e336
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e0b28598 f3b13f10

core/java/android/inputmethodservice/InputMethodService.java

+4 −2
Original line number Diff line number Diff line
@@ -1019,8 +1019,9 @@ public class InputMethodService extends AbstractInputMethodService { 
            if (!mOnPreparedStylusHwCalled) {

                // prepare hasn't been called by Stylus HOVER.

                onPrepareStylusHandwriting();

                mOnPreparedStylusHwCalled = true;

            }

            // reset flag as it's not relevant after onStartStylusHandwriting().

            mOnPreparedStylusHwCalled = false;

            if (onStartStylusHandwriting()) {

                cancelStylusWindowIdleTimeout();

                mPrivOps.onStylusHandwritingReady(requestId, Process.myPid());
@@ -3089,7 +3090,8 @@ public class InputMethodService extends AbstractInputMethodService { 
        mInputStarted = false;

        mStartedInputConnection = null;

        mCurCompletions = null;

        if (mInkWindow != null) {

        if (!mOnPreparedStylusHwCalled) {

            // If IME didn't prepare to show InkWindow for current handwriting session.

            finishStylusHandwriting();

        }

        // Back callback is typically unregistered in {@link #hideWindow()}, but it's possible