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

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

Fix many small nits. 

...the interaction of which results in a very bad bug.

Bug: 11648854
Change-Id: I774489e384388f187e72b9ac091ab387c5e1a79a
parent a5f5ab84

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

+9 −2
Original line number Diff line number Diff line
@@ -910,6 +910,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
                false /* shouldFinishComposition */)) {

            // We try resetting the caches up to 5 times before giving up.

            mHandler.postResetCaches(isDifferentTextField, 5 /* remainingTries */);

            // mLastSelection{Start,End} are reset later in this method, don't need to do it here

            canReachInputConnection = false;

        } else {

            if (isDifferentTextField) {
@@ -989,10 +990,16 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
            if (textLength > mLastSelectionStart

                    || (textLength < Constants.EDITOR_CONTENTS_CACHE_SIZE

                            && mLastSelectionStart < Constants.EDITOR_CONTENTS_CACHE_SIZE)) {

                // It should not be possible to have only one of those variables be

                // NOT_A_CURSOR_POSITION, so if they are equal, either the selection is zero-sized

                // (simple cursor, no selection) or there is no cursor/we don't know its pos

                final boolean wasEqual = mLastSelectionStart == mLastSelectionEnd;

                mLastSelectionStart = textLength;

                // We can't figure out the value of mLastSelectionEnd :(

                // But at least if it's smaller than mLastSelectionStart something is wrong

                if (mLastSelectionStart > mLastSelectionEnd) {

                // But at least if it's smaller than mLastSelectionStart something is wrong,

                // and if they used to be equal we also don't want to make it look like there is a

                // selection.

                if (wasEqual || mLastSelectionStart > mLastSelectionEnd) {

                    mLastSelectionEnd = mLastSelectionStart;

                }

            }

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

+6 −2
Original line number Diff line number Diff line
@@ -292,7 +292,11 @@ public final class RichInputConnection { 
                mCommittedTextBeforeComposingText.length() + mComposingText.length();

        // If we have enough characters to satisfy the request, or if we have all characters in

        // the text field, then we can return the cached version right away.

        if (cachedLength >= n || cachedLength >= mExpectedCursorPosition) {

        // However, if we don't have an expected cursor position, then we should always

        // go fetch the cache again (as it happens, INVALID_CURSOR_POSITION < 0, so we need to

        // test for this explicitly)

        if (INVALID_CURSOR_POSITION != mExpectedCursorPosition

                && (cachedLength >= n || cachedLength >= mExpectedCursorPosition)) {

            final StringBuilder s = new StringBuilder(mCommittedTextBeforeComposingText);

            // We call #toString() here to create a temporary object.

            // In some situations, this method is called on a worker thread, and it's possible