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

Commit 9c2642eb authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Presubmit Automerger Backend
Browse files

[automerge] Fix NPE when IMM#invalidateInput() is called too early 2p: a4a6960b 

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

Change-Id: I4c9203d04885638ca39e4aec5e539816cfe9a10e
parents 2a892647 a4a6960b

core/java/android/view/inputmethod/InputMethodManager.java

+9 −2
Original line number Diff line number Diff line
@@ -2031,14 +2031,20 @@ public final class InputMethodManager { 
     * @param inputConnection the connection to be invalidated.

     * @param textSnapshot {@link TextSnapshot} to be used to update {@link EditorInfo}.

     * @param sessionId the session ID to be sent.

     * @return {@code true} if the operation is done. {@code false} if the caller needs to fall back

     *         to {@link InputMethodManager#restartInput(View)}.

     * @hide

     */

    public void doInvalidateInput(@NonNull RemoteInputConnectionImpl inputConnection,

    public boolean doInvalidateInput(@NonNull RemoteInputConnectionImpl inputConnection,

            @NonNull TextSnapshot textSnapshot, int sessionId) {

        synchronized (mH) {

            if (mServedInputConnection != inputConnection || mCurrentTextBoxAttribute == null) {

                // OK to ignore because the calling InputConnection is already abandoned.

                return;

                return true;

            }

            if (mCurrentInputMethodSession == null) {

                // IME is not yet bound to the client.  Need to fall back to the restartInput().

                return false;

            }

            final EditorInfo editorInfo = mCurrentTextBoxAttribute.createCopyInternal();

            editorInfo.initialSelStart = mCursorSelStart = textSnapshot.getSelectionStart();
@@ -2051,6 +2057,7 @@ public final class InputMethodManager { 
                    sessionId);

            forAccessibilitySessions(wrapper -> wrapper.invalidateInput(editorInfo,

                    mServedInputConnection, sessionId));

            return true;

        }

    }

core/java/com/android/internal/inputmethod/RemoteInputConnectionImpl.java

+2 −3
Original line number Diff line number Diff line
@@ -282,9 +282,8 @@ public final class RemoteInputConnectionImpl extends IInputContext.Stub { 


                    if (!alwaysTrueEndBatchEditDetected) {

                        final TextSnapshot textSnapshot = ic.takeSnapshot();

                        if (textSnapshot != null) {

                            mParentInputMethodManager.doInvalidateInput(this, textSnapshot,

                                    nextSessionId);

                        if (textSnapshot != null && mParentInputMethodManager.doInvalidateInput(

                                this, textSnapshot, nextSessionId)) {

                            return;

                        }

                    }