aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorYohei Yukawa <yukawa@google.com>2014-08-27 23:53:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-27 23:53:46 +0000
commiteacc930638f95531efa4e3f9cf9c8cb8251a4ef0 (patch)
tree6a31033dce80983fa00fffda9c078a5196fd7c72 /java/src
parent276153392aa47b7391908eeaa8f324000cbdaddd (diff)
parentaf5c2b24e7a5226f19aa94c67268061cbc6ab060 (diff)
downloadlatinime-eacc930638f95531efa4e3f9cf9c8cb8251a4ef0.tar.gz
latinime-eacc930638f95531efa4e3f9cf9c8cb8251a4ef0.tar.xz
latinime-eacc930638f95531efa4e3f9cf9c8cb8251a4ef0.zip
am af5c2b24: am 8d0d2363: am acce1aa5: Make sure to obtain the IC before requesting CursorAnchorInfo
* commit 'af5c2b24e7a5226f19aa94c67268061cbc6ab060': Make sure to obtain the IC before requesting CursorAnchorInfo
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/RichInputConnection.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/RichInputConnection.java b/java/src/com/android/inputmethod/latin/RichInputConnection.java
index 497823aeb..f1c7f4340 100644
--- a/java/src/com/android/inputmethod/latin/RichInputConnection.java
+++ b/java/src/com/android/inputmethod/latin/RichInputConnection.java
@@ -924,8 +924,14 @@ public final class RichInputConnection {
*/
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;
}