commit 8d0d236394548be4e2302a03960ce4ee363a5483
author Yohei Yukawa <yukawa@google.com> Wed Aug 27 23:30:39 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 27 23:30:39 2014 +0000
tree e5e5f9d382f576d701535af824602261a4c9352e
parent 68a2a69ae35352650a4c6dfc0b0c69069c4a1e1d
parent acce1aa59eac6816fe3ce1fcb014666fc71a40f1

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

* commit 'acce1aa59eac6816fe3ce1fcb014666fc71a40f1':
  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;
     }