commit 78573f2e8a7dbf67e16fa4dd531f33cba0df7ff5
author Jean Chalard <jchalard@google.com> Fri Jun 15 02:42:32 2012 +0900
committer Jean Chalard <jchalard@google.com> Fri Jun 15 05:47:35 2012 +0900
tree 8cdd7eeb13053e0a2dcfc27f59808e8f6f591bad
parent d2f210dbe2c3562151f85ec25c45858462fd08ed

Fix an NPE

This code is temporary until we get rid of this member.

Bug: 6662963
Bug: 6667091
Change-Id: I1d970d2a97992507e86c5b94978a2543fe42b375

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..b3a0f54 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -872,7 +872,7 @@
         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 boolean isSuggestionsRequested() {
         // TODO: move this method to mSettingsValues
-        return mInputAttributes.mIsSettingsSuggestionStripOn
+        return (null != mInputAttributes && mInputAttributes.mIsSettingsSuggestionStripOn)
                 && (mCurrentSettings.isCorrectionOn() || isShowingSuggestionsStrip());
     }
 
@@ -1648,7 +1648,7 @@
             return true;
         if (!isShowingSuggestionsStrip())
             return false;
-        if (mInputAttributes.mApplicationSpecifiedCompletionOn)
+        if (null != mInputAttributes && mInputAttributes.mApplicationSpecifiedCompletionOn)
             return true;
         return isSuggestionsRequested();
     }
@@ -1830,7 +1830,7 @@
             }
         }
 
-        if (mInputAttributes.mApplicationSpecifiedCompletionOn
+        if ((null != mInputAttributes && mInputAttributes.mApplicationSpecifiedCompletionOn)
                 && mApplicationSpecifiedCompletions != null
                 && index >= 0 && index < mApplicationSpecifiedCompletions.length) {
             if (mSuggestionsView != null) {