summaryrefslogtreecommitdiff
path: root/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-06-13 11:01:36 +0900
committerTadashi G. Takaoka <takaoka@google.com>2014-06-13 11:04:56 +0900
commita68e0dd437daa1387edc65082f96a00ca258a7b0 (patch)
treebb2188cc3a3dbd58b0d4b0a0c17a6dc873158c1e /java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
parent89899e14dfe4c40ed833ba0ef7d0b06e281d0331 (diff)
Fix NPE by disabling key preview popup of Emoji palette
Bug: 15579928 Change-Id: I6bcf885f2c1aa37b337a85978409ccf41e459c2a
Diffstat (limited to 'java/src/com/android/inputmethod/keyboard/MainKeyboardView.java')
-rw-r--r--java/src/com/android/inputmethod/keyboard/MainKeyboardView.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
index bcd0cd848..9a859bfdb 100644
--- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
@@ -446,15 +446,15 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
@Override
public void showKeyPreview(final Key key) {
- // If key is invalid or IME is already closed, we must not show key preview.
- // Trying to show key preview while root window is closed causes
- // WindowManager.BadTokenException.
- if (key == null) {
+ // If the key is invalid or has no key preview, we must not show key preview.
+ if (key == null || key.noKeyPreview()) {
return;
}
-
- final KeyPreviewDrawParams previewParams = mKeyPreviewDrawParams;
final Keyboard keyboard = getKeyboard();
+ if (keyboard == null) {
+ return;
+ }
+ final KeyPreviewDrawParams previewParams = mKeyPreviewDrawParams;
if (!previewParams.isPopupEnabled()) {
previewParams.setVisibleOffset(-keyboard.mVerticalGap);
return;