aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYohei Yukawa <yukawa@google.com>2014-02-13 17:56:36 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-13 17:56:36 -0800
commitf45b3b98cfb3f3fc2f5883da5e60ba6ccf432ef6 (patch)
tree235765e256800645ef2e50d4e1fc59a461b4e2f3
parenta1e6d5cb5f48efdfb3caadf600ec20da86c0df53 (diff)
parent362ab36cf009d724768e742c3b2e264387efc521 (diff)
downloadlatinime-f45b3b98cfb3f3fc2f5883da5e60ba6ccf432ef6.tar.gz
latinime-f45b3b98cfb3f3fc2f5883da5e60ba6ccf432ef6.tar.xz
latinime-f45b3b98cfb3f3fc2f5883da5e60ba6ccf432ef6.zip
am 362ab36c: Fix a null object reference crash on Emoji Palette
* commit '362ab36cf009d724768e742c3b2e264387efc521': Fix a null object reference crash on Emoji Palette
-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