diff options
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SuggestedWords.java | 5 | ||||
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/InputTestsBase.java | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java index 0c0ce182f..91110d888 100644 --- a/java/src/com/android/inputmethod/latin/SuggestedWords.java +++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java @@ -87,8 +87,9 @@ public class SuggestedWords { final CompletionInfo[] infos) { final ArrayList<SuggestedWordInfo> result = new ArrayList<SuggestedWordInfo>(); for (CompletionInfo info : infos) { - if (null != info) result.add(new SuggestedWordInfo(info.getText(), - SuggestedWordInfo.MAX_SCORE)); + if (null != info && info.getText() != null) { + result.add(new SuggestedWordInfo(info.getText(), SuggestedWordInfo.MAX_SCORE)); + } } return result; } diff --git a/tests/src/com/android/inputmethod/latin/InputTestsBase.java b/tests/src/com/android/inputmethod/latin/InputTestsBase.java index c56026c8e..4dfe22800 100644 --- a/tests/src/com/android/inputmethod/latin/InputTestsBase.java +++ b/tests/src/com/android/inputmethod/latin/InputTestsBase.java @@ -95,7 +95,7 @@ public class InputTestsBase extends ServiceTestCase<LatinIME> { final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mLatinIME); final boolean previousDebugSetting = prefs.getBoolean(PREF_DEBUG_MODE, false); final SharedPreferences.Editor editor = prefs.edit(); - editor.putBoolean(PREF_DEBUG_MODE, true); + editor.putBoolean(PREF_DEBUG_MODE, mode); editor.commit(); return previousDebugSetting; } |