diff options
| author |   satok <satok@google.com> | 2010-09-28 12:48:46 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 12:48:46 -0700 |
| commit | ed85235beef9c3a8f47c94c2ff3e49531a0d3e80 (patch) | |
| tree | 5a1485ac77fe0aac8f65d3d9b554d5f5e029969d /java/src | |
| parent | 2b4cc0db61e7b5cf11552b6f0e444f254a8a7628 (diff) | |
| parent | ad090ac3f4cee327adf74e8b35bbc446a8d64070 (diff) | |
| download | latinime-ed85235beef9c3a8f47c94c2ff3e49531a0d3e80.tar.gz latinime-ed85235beef9c3a8f47c94c2ff3e49531a0d3e80.tar.xz latinime-ed85235beef9c3a8f47c94c2ff3e49531a0d3e80.zip | |
am ad090ac3: am 008e9b3e: Fix Null pointer exception on closing and update assets
Merge commit 'ad090ac3f4cee327adf74e8b35bbc446a8d64070'
* commit 'ad090ac3f4cee327adf74e8b35bbc446a8d64070':
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 92340dcce..f16f08f78 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1486,7 +1486,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) { |