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

Commit 5557bf5b authored by Jean Chalard's avatar Jean Chalard Committed by Android Git Automerger
Browse files

am 10800d4b: am a024ac6b: Merge "Fix an NPE" 

* commit '10800d4b':
  Fix an NPE
parents 895fca8f 10800d4b

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

+2 −2
Original line number Diff line number Diff line
@@ -995,8 +995,6 @@ public final class LatinIME extends InputMethodService implements KeyboardAction 
            }

        }

        if (!mSettings.getCurrent().isApplicationSpecifiedCompletionsOn()) return;

        mApplicationSpecifiedCompletions =

                CompletionInfoUtils.removeNulls(applicationSpecifiedCompletions);

        if (applicationSpecifiedCompletions == null) {

            clearSuggestionStrip();

            if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
@@ -1004,6 +1002,8 @@ public final class LatinIME extends InputMethodService implements KeyboardAction 
            }

            return;

        }

        mApplicationSpecifiedCompletions =

                CompletionInfoUtils.removeNulls(applicationSpecifiedCompletions);



        final ArrayList<SuggestedWords.SuggestedWordInfo> applicationSuggestedWords =

                SuggestedWords.getFromApplicationSpecifiedCompletions(