aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2010-02-05 10:42:14 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-02-05 10:42:14 -0800
commit4a29e9fdea2c3e4627b4a8dbcc13e6103333bc0c (patch)
tree3da3d0c16866eed943c51c33f3a73b80582d8014
parentc2a862a17b7835075a89fab2d44095f2fc568801 (diff)
parent1322b7f899e9d3ccfb91d9e3ede99b3ad336c354 (diff)
downloadlatinime-4a29e9fdea2c3e4627b4a8dbcc13e6103333bc0c.tar.gz
latinime-4a29e9fdea2c3e4627b4a8dbcc13e6103333bc0c.tar.xz
latinime-4a29e9fdea2c3e4627b4a8dbcc13e6103333bc0c.zip
Merge "fixing ime crash in emulator"
-rw-r--r--src/com/android/inputmethod/latin/LatinIME.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/inputmethod/latin/LatinIME.java b/src/com/android/inputmethod/latin/LatinIME.java
index ef761a06e..8b9c0cac7 100644
--- a/src/com/android/inputmethod/latin/LatinIME.java
+++ b/src/com/android/inputmethod/latin/LatinIME.java
@@ -565,14 +565,18 @@ public class LatinIME extends InputMethodService
public void onFinishInput() {
super.onFinishInput();
- if (mAfterVoiceInput) mVoiceInput.logInputEnded();
+ if (VOICE_INSTALLED && mAfterVoiceInput) {
+ mVoiceInput.logInputEnded();
+ }
- mVoiceInput.flushLogs();
+ if (VOICE_INSTALLED) {
+ mVoiceInput.flushLogs();
+ }
if (mInputView != null) {
mInputView.closing();
}
- if (VOICE_INSTALLED & mRecognizing) {
+ if (VOICE_INSTALLED && mRecognizing) {
mVoiceInput.cancel();
}
}