From afdcc15ca8ea75f4c5a22d7d25eb5e253bdf1c7f Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Thu, 15 May 2014 16:07:15 +0900
Subject: [PATCH] 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index fc9faa6e3..b7a76944e 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -254,7 +254,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
     // 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),