aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-10-23 09:19:07 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-23 09:19:07 +0000
commitf3864708d99c6af0f3811da2a2a3e502fefb7f0a (patch)
treefb4a1f3bc7552e68a03f65a008307a3180897dda /java/src
parentab33628b36e0e93173697690e3591e8e531da977 (diff)
parentb224594aca568be0353404a26e101dd5f7f23f8b (diff)
downloadlatinime-f3864708d99c6af0f3811da2a2a3e502fefb7f0a.tar.gz
latinime-f3864708d99c6af0f3811da2a2a3e502fefb7f0a.tar.xz
latinime-f3864708d99c6af0f3811da2a2a3e502fefb7f0a.zip
am b224594a: Merge "Fix a concurrency bug that ends up in a crash."
* commit 'b224594aca568be0353404a26e101dd5f7f23f8b': Fix a concurrency bug that ends up in a crash.
Diffstat (limited to 'java/src')
-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);
}