Fix an NPE. (a94733cb) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -152,12 +152,16 @@ public final class AccessibilityUtils {
		* will occur when a key is typed.
		*
		* @param suggestedWords the list of suggested auto-correction words
		* @param typedWord the currently typed word
		*/
		public void setAutoCorrection(final SuggestedWords suggestedWords, final String typedWord) {
		public void setAutoCorrection(final SuggestedWords suggestedWords) {
		if (suggestedWords.mWillAutoCorrect) {
		mAutoCorrectionWord = suggestedWords.getWord(SuggestedWords.INDEX_OF_AUTO_CORRECTION);
		mTypedWord = typedWord;
		final SuggestedWords.SuggestedWordInfo typedWordInfo = suggestedWords.mTypedWordInfo;
		if (null == typedWordInfo) {
		mTypedWord = null;
		} else {
		mTypedWord = typedWordInfo.mWord;
		}
		} else {
		mAutoCorrectionWord = null;
		mTypedWord = null;

+1 −2

Original line number	Diff line number	Diff line
		@@ -1637,8 +1637,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		}
		// Cache the auto-correction in accessibility code so we can speak it if the user
		// touches a key that will insert it.
		AccessibilityUtils.getInstance().setAutoCorrection(suggestedWords,
		suggestedWords.mTypedWordInfo.mWord);
		AccessibilityUtils.getInstance().setAutoCorrection(suggestedWords);
		}

		// Called from {@link SuggestionStripView} through the {@link SuggestionStripView#Listener}