diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-08-04 09:40:25 -0700 |
|---|---|---|
| committer |   The Android Automerger <android-build@android.com> | 2011-08-04 13:17:24 -0700 |
| commit | ab64a7c85974c8e8e319488db2dc025c33939582 (patch) | |
| tree | ea085d5b766d305f190164f9a850d19287a56cf5 /java | |
| parent | e6c61c08c74e8684ed2956468271b01ff01ce55d (diff) | |
| download | latinime-ab64a7c85974c8e8e319488db2dc025c33939582.tar.gz latinime-ab64a7c85974c8e8e319488db2dc025c33939582.tar.xz latinime-ab64a7c85974c8e8e319488db2dc025c33939582.zip | |
Fix NPE
Bug: 5120674
Change-Id: Iedfd7af33a96b68d83d9a844f61ac40b9523ecdb
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java | 5 |
1 files changed, 4 insertions, 1 deletions
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; } |