aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorYohei Yukawa <yukawa@google.com>2014-02-14 10:34:13 +0900
committerYohei Yukawa <yukawa@google.com>2014-02-14 10:36:31 +0900
commit362ab36cf009d724768e742c3b2e264387efc521 (patch)
tree829a812054c6dbbf37f7ebdc4a1ea5804ef97135 /java/src
parent5f9f4b929b246491865553758fe55d58e720ca44 (diff)
downloadlatinime-362ab36cf009d724768e742c3b2e264387efc521.tar.gz
latinime-362ab36cf009d724768e742c3b2e264387efc521.tar.xz
latinime-362ab36cf009d724768e742c3b2e264387efc521.zip
Fix a null object reference crash on Emoji Palette
Do nothing if the current EmojiPageKeyboardView is null. BUG: 13006906 Change-Id: I169b70122ec939075b5be033953b48762fd528fc
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java b/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java
index 50e8163c3..c34464314 100644
--- a/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java
+++ b/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java
@@ -724,7 +724,9 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
// canceled.
final EmojiPageKeyboardView currentKeyboardView =
mActiveKeyboardViews.get(mActivePosition);
- currentKeyboardView.releaseCurrentKey();
+ if (currentKeyboardView != null) {
+ currentKeyboardView.releaseCurrentKey();
+ }
}
@Override