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

Commit bb4ca891 authored by Jean Chalard's avatar Jean Chalard Committed by The Android Automerger
Browse files

Fix an NPE. 

Bug: 17958289
Change-Id: I5c9ea668ff75b38c7ddebd767c36a950835c0c9f
parent 1fdaf5a2

java/src/com/android/inputmethod/latin/RichInputConnection.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -860,9 +860,10 @@ public final class RichInputConnection implements PrivateCommandPerformer { 
     * than it really is.

     * than it really is.

     */

     */

    public void tryFixLyingCursorPosition() {

    public void tryFixLyingCursorPosition() {

        mIC = mParent.getCurrentInputConnection();

        final CharSequence textBeforeCursor = getTextBeforeCursor(

        final CharSequence textBeforeCursor = getTextBeforeCursor(

                Constants.EDITOR_CONTENTS_CACHE_SIZE, 0);

                Constants.EDITOR_CONTENTS_CACHE_SIZE, 0);

        final CharSequence selectedText = mIC.getSelectedText(0 /* flags */);

        final CharSequence selectedText = null == mIC ? null : mIC.getSelectedText(0 /* flags */);

        if (null == textBeforeCursor ||

        if (null == textBeforeCursor ||

                (!TextUtils.isEmpty(selectedText) && mExpectedSelEnd == mExpectedSelStart)) {

                (!TextUtils.isEmpty(selectedText) && mExpectedSelEnd == mExpectedSelStart)) {

            // If textBeforeCursor is null, we have no idea what kind of text field we have or if

            // If textBeforeCursor is null, we have no idea what kind of text field we have or if