Merge "Call existing method on the binding controller"

services/core/java/com/android/server/inputmethod/InputMethodBindingController.java

@@ -515,7 +515,7 @@ final class InputMethodBindingController {
             if (DEBUG) {
                 Slog.d(TAG, "Cannot show input: no IME bound. Rebinding.");
             }
-            bindCurrentMethodLocked();
+            bindCurrentMethod();
             return;
         }
 

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

@@ -2411,7 +2411,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
             if (DEBUG) {
                 Slog.d(TAG, "Avoiding IME startup and unbinding current input method.");
             }
-            mBindingController.unbindCurrentMethodLocked();
+            mBindingController.unbindCurrentMethod();
             return InputBindResult.NO_EDITOR;
         }