commit 7f226b4f9db15105b10fdc04249db433772e87b4
author Jean Chalard <jchalard@google.com> Wed Oct 01 10:16:39 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 01 10:16:40 2014 +0000
tree 7235d21a83361f37a313d4623334b341073d5eb5
parent 31c16d41bc67fa9def9290bb72594d35833b48f6
parent 57e29436b1f4a7b1e0072f33212e97118ed924d2

Merge "Fix an NPE on ICS factory rom."

java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java

diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
index d7e1eba..48c8afa 100644
--- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
+++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
@@ -1649,8 +1649,10 @@
                 }
             }
             // Add the suggestion list to the list of suggestions.
-            textToCommit.setSpan(new SuggestionSpan(inputTransaction.mSettingsValues.mLocale,
-                    suggestions.toArray(new String[suggestions.size()]), 0 /* flags */),
+            textToCommit.setSpan(new SuggestionSpan(mLatinIME /* context */,
+                    inputTransaction.mSettingsValues.mLocale,
+                    suggestions.toArray(new String[suggestions.size()]), 0 /* flags */,
+                    null /* notificationTargetClass */),
                     0 /* start */, lastCharIndex /* end */, 0 /* flags */);
         }