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

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();
     }
 

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
+    public static void logOnManualSuggestion(
-            , List<CharSequence> suggestions) {
+            String before, String after, int position, List<CharSequence> suggestions) {
    }
 
     public static void logOnAutoSuggestion(String before, String after) {