diff options
| author |   Yohei Yukawa <yukawa@google.com> | 2014-02-14 10:34:13 +0900 |
|---|---|---|
| committer |   The Android Automerger <android-build@android.com> | 2014-02-13 19:13:55 -0800 |
| commit | 6011878e3135805762e9d4e76ac44d70b90bba08 (patch) | |
| tree | a1d046c5bd17def4d6189154a65b63c1dd26f0e5 /java/src | |
| parent | b89c784f27fd8f1e8ee11d5654383663ff0cb1fb (diff) | |
| download | latinime-6011878e3135805762e9d4e76ac44d70b90bba08.tar.gz latinime-6011878e3135805762e9d4e76ac44d70b90bba08.tar.xz latinime-6011878e3135805762e9d4e76ac44d70b90bba08.zip | |
Fix a null object reference crash on Emoji Palette
Do nothing if the current EmojiPageKeyboardView is null.
BUG: 13006906
Change-Id: I169b70122ec939075b5be033953b48762fd528fc
Conflicts:
java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java b/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java index b44741cda..c34464314 100644 --- a/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java +++ b/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java @@ -723,8 +723,10 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange // Make sure the delayed key-down event (highlight effect and haptic feedback) will be // canceled. final EmojiPageKeyboardView currentKeyboardView = - mActiveKeyboardViews.get(mActivePosition); - currentKeyboardView.releaseCurrentKey(); + mActiveKeyboardViews.get(mActivePosition); + if (currentKeyboardView != null) { + currentKeyboardView.releaseCurrentKey(); + } } @Override |