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

Commit 5d7261b3 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... 

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

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



Change-Id: I057a29d50d5d3ee29be4d56ee82001eef70d1014
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 65d49acb e5c151fd

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