diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-06-15 02:42:32 +0900 |
|---|---|---|
| committer | Jean Chalard <jchalard@google.com> | 2012-06-15 05:47:35 +0900 |
| commit | 78573f2e8a7dbf67e16fa4dd531f33cba0df7ff5 (patch) | |
| tree | 8cdd7eeb13053e0a2dcfc27f59808e8f6f591bad /java/src | |
| parent | d2f210dbe2c3562151f85ec25c45858462fd08ed (diff) | |
| download | latinime-78573f2e8a7dbf67e16fa4dd531f33cba0df7ff5.tar.gz latinime-78573f2e8a7dbf67e16fa4dd531f33cba0df7ff5.tar.xz latinime-78573f2e8a7dbf67e16fa4dd531f33cba0df7ff5.zip | |
Fix an NPE
This code is temporary until we get rid of this member.
Bug: 6662963
Bug: 6667091
Change-Id: I1d970d2a97992507e86c5b94978a2543fe42b375
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 3456ce945..b3a0f54b9 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -872,7 +872,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen if (ProductionFlag.IS_EXPERIMENTAL) { ResearchLogger.latinIME_onDisplayCompletions(applicationSpecifiedCompletions); } - if (mInputAttributes.mApplicationSpecifiedCompletionOn) { + if (null != mInputAttributes && mInputAttributes.mApplicationSpecifiedCompletionOn) { mApplicationSpecifiedCompletions = applicationSpecifiedCompletions; if (applicationSpecifiedCompletions == null) { clearSuggestions(); @@ -1628,7 +1628,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen public boolean isSuggestionsRequested() { // TODO: move this method to mSettingsValues - return mInputAttributes.mIsSettingsSuggestionStripOn + return (null != mInputAttributes && mInputAttributes.mIsSettingsSuggestionStripOn) && (mCurrentSettings.isCorrectionOn() || isShowingSuggestionsStrip()); } @@ -1648,7 +1648,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen return true; if (!isShowingSuggestionsStrip()) return false; - if (mInputAttributes.mApplicationSpecifiedCompletionOn) + if (null != mInputAttributes && mInputAttributes.mApplicationSpecifiedCompletionOn) return true; return isSuggestionsRequested(); } @@ -1830,7 +1830,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen } } - if (mInputAttributes.mApplicationSpecifiedCompletionOn + if ((null != mInputAttributes && mInputAttributes.mApplicationSpecifiedCompletionOn) && mApplicationSpecifiedCompletions != null && index >= 0 && index < mApplicationSpecifiedCompletions.length) { if (mSuggestionsView != null) { |