summaryrefslogtreecommitdiff
path: root/java/src/com/android/inputmethod/keyboard/KeyDetector.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-08-08 11:41:58 +0900
committerTadashi G. Takaoka <takaoka@google.com>2012-08-09 11:55:41 +0900
commit8335c59ea7715f3dbc6625f128a7a038f314a89f (patch)
tree97df9113b76753b823ec9330007a661797b542e6 /java/src/com/android/inputmethod/keyboard/KeyDetector.java
parent732f27984e3e9c98748aee4726dc9eaed7a14776 (diff)
Fix NPE and don't call UI API from non-UI thread
This change also reverts I29ec3e9f10484f30288fac76f0c45b3707bc2259 Bug: 6956969 Bug: 6891020 Bug: 6947253 Change-Id: I7901c0f9489b4deb79314c2c903b138611bfd78e
Diffstat (limited to 'java/src/com/android/inputmethod/keyboard/KeyDetector.java')
-rw-r--r--java/src/com/android/inputmethod/keyboard/KeyDetector.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyDetector.java b/java/src/com/android/inputmethod/keyboard/KeyDetector.java
index 97d88af4a..c0e6aa8d7 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyDetector.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyDetector.java
@@ -59,6 +59,9 @@ public class KeyDetector {
}
public Keyboard getKeyboard() {
+ if (mKeyboard == null) {
+ throw new IllegalStateException("keyboard isn't set");
+ }
return mKeyboard;
}