nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am a94733cb: Fix an NPE. 

* commit 'a94733cbca5bc3544fa73fa1649bbb1dadf31356':
  Fix an NPE.
main
Jean Chalard 2014-11-20 05:53:43 +00:00 committed by Android Git Automerger
parent d0fea7bebf a94733cbca
commit c4b2322970
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java
View File

@ -152,12 +152,16 @@ public final class AccessibilityUtils {
* will occur when a key is typed. * will occur when a key is typed.
* *
* @param suggestedWords the list of suggested auto-correction words * @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) { if (suggestedWords.mWillAutoCorrect) {
mAutoCorrectionWord = suggestedWords.getWord(SuggestedWords.INDEX_OF_AUTO_CORRECTION); 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 { } else {
mAutoCorrectionWord = null; mAutoCorrectionWord = null;
mTypedWord = null; mTypedWord = null;

3
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -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 // Cache the auto-correction in accessibility code so we can speak it if the user
// touches a key that will insert it. // touches a key that will insert it.
AccessibilityUtils.getInstance().setAutoCorrection(suggestedWords, AccessibilityUtils.getInstance().setAutoCorrection(suggestedWords);
suggestedWords.mTypedWordInfo.mWord);
} }
// Called from {@link SuggestionStripView} through the {@link SuggestionStripView#Listener} // Called from {@link SuggestionStripView} through the {@link SuggestionStripView#Listener}