commit 67b9337b6cc478973d2c628fb5686583ce339bf0
author Satoshi Kataoka <satok@google.com> Tue Jun 19 03:28:19 2012 +0900
committer Satoshi Kataoka <satok@google.com> Tue Jun 19 03:34:45 2012 +0900
tree 3a860ed248a9ce8eea79d5746d0abee2ffa198c6
parent d2f210dbe2c3562151f85ec25c45858462fd08ed

Fix possible NPE from a concurrent problem in LatinIME

Bug: 6620746
Change-Id: Icc18de92d7edc6888c712c2cf5ce479a65f8bfad

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

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 3456ce9..8c244d6 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1971,7 +1971,8 @@
         // want corrections enabled or learned.
         if (!mCurrentSettings.isCorrectionOn()) return null;
 
-        if (mUserHistoryDictionary != null) {
+        final UserHistoryDictionary userHistoryDictionary = mUserHistoryDictionary;
+        if (userHistoryDictionary != null) {
             final CharSequence prevWord
                     = mConnection.getPreviousWord(mCurrentSettings.mWordSeparators);
             final String secondWord;
@@ -1986,7 +1987,7 @@
             final int maxFreq = AutoCorrection.getMaxFrequency(
                     mSuggest.getUnigramDictionaries(), suggestion);
             if (maxFreq == 0) return null;
-            mUserHistoryDictionary.addToUserHistory(null == prevWord ? null : prevWord.toString(),
+            userHistoryDictionary.addToUserHistory(null == prevWord ? null : prevWord.toString(),
                     secondWord, maxFreq > 0);
             return prevWord;
         }