commit afdcc15ca8ea75f4c5a22d7d25eb5e253bdf1c7f
author Tadashi G. Takaoka <takaoka@google.com> Thu May 15 16:07:15 2014 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Thu May 15 16:07:15 2014 +0900
tree bda52b6a7514248a046b0509a2572bc7551528f4
parent 50c21b5e9296a2cbde2ccd2b488f890f42291104

Fix NPE in KeyboardSwitcher while orientation change

This is a follow up of I8a737e2b73.

Bug: 14981300
Bug: 14419121
Change-Id: I87f910adbff248d9606d074c351aa951c9539163

java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java

diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index fc9faa6..b7a7694 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -254,7 +254,7 @@
     // Implements {@link KeyboardState.SwitchActions}.
     @Override
     public void setEmojiKeyboard() {
-        final Keyboard keyboard = mKeyboardView.getKeyboard();
+        final Keyboard keyboard = mKeyboardLayoutSet.getKeyboard(KeyboardId.ELEMENT_ALPHABET);
         mMainKeyboardFrame.setVisibility(View.GONE);
         mEmojiPalettesView.startEmojiPalettes(
                 mKeyboardTextsSet.getText(KeyboardTextsSet.SWITCH_TO_ALPHA_KEY_LABEL),