diff options
| author |   satok <satok@google.com> | 2010-09-28 03:29:30 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 03:29:30 -0700 |
| commit | ad090ac3f4cee327adf74e8b35bbc446a8d64070 (patch) | |
| tree | 5793f9c34484be726010f21f8cdb221217e7d4e1 /java/src | |
| parent | 5f1aecb27d008803def36efeba9d2503035c1ac4 (diff) | |
| parent | 008e9b3e1a8c037e0275b19f284a7d2e76c9e140 (diff) | |
| download | latinime-ad090ac3f4cee327adf74e8b35bbc446a8d64070.tar.gz latinime-ad090ac3f4cee327adf74e8b35bbc446a8d64070.tar.xz latinime-ad090ac3f4cee327adf74e8b35bbc446a8d64070.zip | |
am 008e9b3e: Fix Null pointer exception on closing and update assets
Merge commit '008e9b3e1a8c037e0275b19f284a7d2e76c9e140' into gingerbread-plus-aosp
* commit '008e9b3e1a8c037e0275b19f284a7d2e76c9e140':
Fix Null pointer exception on closing and update assets
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 7 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinImeLogger.java | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 01f3ba66c..26f8a328b 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1487,7 +1487,12 @@ public class LatinIME extends InputMethodService mVoiceInput.cancel(); } requestHideSelf(0); - mKeyboardSwitcher.getInputView().closing(); + if (mKeyboardSwitcher != null) { + LatinKeyboardView inputView = mKeyboardSwitcher.getInputView(); + if (inputView != null) { + inputView.closing(); + } + } TextEntryState.endSession(); } diff --git a/java/src/com/android/inputmethod/latin/LatinImeLogger.java b/java/src/com/android/inputmethod/latin/LatinImeLogger.java index 6d15d216c..a8ab9cc98 100644 --- a/java/src/com/android/inputmethod/latin/LatinImeLogger.java +++ b/java/src/com/android/inputmethod/latin/LatinImeLogger.java @@ -37,8 +37,8 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang public static void onDestroy() { } - public static void logOnManualSuggestion(String before, String after, int position - , List<CharSequence> suggestions) { + public static void logOnManualSuggestion( + String before, String after, int position, List<CharSequence> suggestions) { } public static void logOnAutoSuggestion(String before, String after) { |