commit 94ac3d760b98aa148cc9386e0a4b4a20978db85d
author Tadashi G. Takaoka <takaoka@google.com> Thu Aug 04 09:40:25 2011 -0700
committer Tadashi G. Takaoka <takaoka@google.com> Thu Aug 04 09:40:25 2011 -0700
tree cb2868cd7eb87f9387ed47aef3f88d69cd7f127f
parent 3234123fba901243990972158d023a5d1c273316

Fix NPE

Bug: 5120674
Change-Id: Iedfd7af33a96b68d83d9a844f61ac40b9523ecdb

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 0779964..811470c 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -187,13 +187,16 @@
         }
 
         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;
         }