am f66b0e5f: am c08c5064: Merge "Fix an NPE when running with Keep." into lmp-dev

* commit 'f66b0e5f71be61e496bd8b77f04384ea14b75da7':
  Fix an NPE when running with Keep.

1 files changed, 4 insertions, 4 deletions

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index c1adc12f9..c7c3aaa18 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -776,15 +776,15 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
 
     private void onStartInputInternal(final EditorInfo editorInfo, final boolean restarting) {
         super.onStartInput(editorInfo, restarting);
+        if (editorInfo == null) {
+            Log.e(TAG, "Null EditorInfo in onStartInput()");
+            return;
+        }
         SettingsValues currentSettingsValues = mSettings.getCurrent();
         final boolean isSameInputType = currentSettingsValues.isSameInputType(editorInfo);
         final boolean hasSameOrientation =
                 currentSettingsValues.hasSameOrientation(getResources().getConfiguration());
         mRichImm.clearSubtypeCaches();
-        if (editorInfo == null) {
-            Log.e(TAG, "Null EditorInfo in onStartInput()");
-            return;
-        }
         final boolean inputTypeChanged = !isSameInputType;
         final boolean isDifferentTextField = !restarting || inputTypeChanged;
         if (isDifferentTextField || !hasSameOrientation) {