From ab64a7c85974c8e8e319488db2dc025c33939582 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Thu, 4 Aug 2011 09:40:25 -0700
Subject: [PATCH] Fix NPE

Bug: 5120674
Change-Id: Iedfd7af33a96b68d83d9a844f61ac40b9523ecdb
---
 .../com/android/inputmethod/keyboard/KeyboardSwitcher.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index 0779964af..811470c26 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -187,13 +187,16 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
         }
 
         public void save() {
+            if (mCurrentId == null) {
+                return;
+            }
             mIsAlphabetMode = isAlphabetMode();
             if (mIsAlphabetMode) {
                 mIsShiftLocked = isShiftLocked();
                 mIsShifted = !mIsShiftLocked && isShiftedOrShiftLocked();
             } else {
                 mIsShiftLocked = false;
-                mIsShifted = mSymbolsShiftedKeyboardId.equals(mCurrentId);
+                mIsShifted = mCurrentId.equals(mSymbolsShiftedKeyboardId);
             }
             mIsValid = true;
         }