commit af5c2b24e7a5226f19aa94c67268061cbc6ab060
author Yohei Yukawa <yukawa@google.com> Wed Aug 27 23:41:33 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 27 23:41:33 2014 +0000
tree 8ddd143d0809a085f56eb5149b163b9c8b3676cd
parent cb7d1a63f16b63dc51e517c191e3498ca13d12d1
parent 8d0d236394548be4e2302a03960ce4ee363a5483

am 8d0d2363: am acce1aa5: Make sure to obtain the IC before requesting CursorAnchorInfo

* commit '8d0d236394548be4e2302a03960ce4ee363a5483':
  Make sure to obtain the IC before requesting CursorAnchorInfo

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

diff --git a/java/src/com/android/inputmethod/latin/RichInputConnection.java b/java/src/com/android/inputmethod/latin/RichInputConnection.java
index 497823a..f1c7f43 100644
--- a/java/src/com/android/inputmethod/latin/RichInputConnection.java
+++ b/java/src/com/android/inputmethod/latin/RichInputConnection.java
@@ -924,8 +924,14 @@
      */
     public boolean requestUpdateCursorAnchorInfo(final boolean enableMonitor,
             final boolean requestImmediateCallback) {
-        final boolean scheduled = InputConnectionCompatUtils.requestUpdateCursorAnchorInfo(mIC,
-                enableMonitor, requestImmediateCallback);
+        mIC = mParent.getCurrentInputConnection();
+        final boolean scheduled;
+        if (null != mIC) {
+            scheduled = InputConnectionCompatUtils.requestUpdateCursorAnchorInfo(mIC,
+                    enableMonitor, requestImmediateCallback);
+        } else {
+            scheduled = false;
+        }
         mCursorAnchorInfoMonitorEnabled = (scheduled && enableMonitor);
         return scheduled;
     }