aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/RichInputConnection.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-10-23 08:02:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-23 08:02:37 +0000
commitb224594aca568be0353404a26e101dd5f7f23f8b (patch)
tree97e93e01051a230a623fe225771f455658896974 /java/src/com/android/inputmethod/latin/RichInputConnection.java
parentade5ad1dae715081e0131e9ebd266e1e36409f1d (diff)
parent4097a20b36c7a6678f2b7486d587b7c43852c2e1 (diff)
downloadlatinime-b224594aca568be0353404a26e101dd5f7f23f8b.tar.gz
latinime-b224594aca568be0353404a26e101dd5f7f23f8b.tar.xz
latinime-b224594aca568be0353404a26e101dd5f7f23f8b.zip
Merge "Fix a concurrency bug that ends up in a crash."
Diffstat (limited to 'java/src/com/android/inputmethod/latin/RichInputConnection.java')
-rw-r--r--java/src/com/android/inputmethod/latin/RichInputConnection.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/RichInputConnection.java b/java/src/com/android/inputmethod/latin/RichInputConnection.java
index be1523f63..69f0b3eb3 100644
--- a/java/src/com/android/inputmethod/latin/RichInputConnection.java
+++ b/java/src/com/android/inputmethod/latin/RichInputConnection.java
@@ -367,7 +367,9 @@ public final class RichInputConnection implements PrivateCommandPerformer {
}
// This never calls InputConnection#getCapsMode - in fact, it's a static method that
// never blocks or initiates IPC.
- return CapsModeUtils.getCapsMode(mCommittedTextBeforeComposingText, inputType,
+ // TODO: don't call #toString() here. Instead, all accesses to
+ // mCommittedTextBeforeComposingText should be done on the main thread.
+ return CapsModeUtils.getCapsMode(mCommittedTextBeforeComposingText.toString(), inputType,
spacingAndPunctuations, hasSpaceBefore);
}