Merge "Ignore unchecked IME show/hide when no root" into rvc-dev am: d74346b8cf

Change-Id: I2435fef798b360c470654831ea74874d32e9dd3f

core/java/android/view/inputmethod/InputMethodManager.java

@@ -1634,16 +1634,22 @@ public final class InputMethodManager {
     @Deprecated
     @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 123768499)
     public void showSoftInputUnchecked(int flags, ResultReceiver resultReceiver) {
+        synchronized (mH) {
             try {
-            Log.w(TAG, "showSoftInputUnchecked() is a hidden method, which will be removed "
+                Log.w(TAG, "showSoftInputUnchecked() is a hidden method, which will be"
-                    + "soon. If you are using android.support.v7.widget.SearchView, please update "
+                        + " removed soon. If you are using android.support.v7.widget.SearchView,"
-                    + "to version 26.0 or newer version.");
+                        + " please update to version 26.0 or newer version.");
+                if (mCurRootView == null || mCurRootView.getView() == null) {
+                    Log.w(TAG, "No current root view, ignoring showSoftInputUnchecked()");
+                    return;
+                }
                 mService.showSoftInput(
                         mClient, mCurRootView.getView().getWindowToken(), flags, resultReceiver);
             } catch (RemoteException e) {
                 throw e.rethrowFromSystemServer();
             }
         }
+    }
 
     /**
      * Flag for {@link #hideSoftInputFromWindow} and {@link InputMethodService#requestHideSelf(int)}
@@ -1986,6 +1992,11 @@ public final class InputMethodManager {
 
     @UnsupportedAppUsage
     void closeCurrentInput() {
+        synchronized (mH) {
+            if (mCurRootView == null || mCurRootView.getView() == null) {
+                Log.w(TAG, "No current root view, ignoring closeCurrentInput()");
+                return;
+            }
             try {
                 mService.hideSoftInput(
                         mClient, mCurRootView.getView().getWindowToken(), HIDE_NOT_ALWAYS, null);
@@ -1993,6 +2004,7 @@ public final class InputMethodManager {
                 throw e.rethrowFromSystemServer();
             }
         }
+    }
 
     /**
      * Register for IME state callbacks and applying visibility in