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

1 files changed, 6 insertions, 1 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();
     }