Merge "Enabling New Insets API with Multi-Session IME." into rvc-dev am: 09419a8129

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11802630

Change-Id: Ide07409d81d179554966771add678b554ef1cd31

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

@@ -1347,13 +1347,14 @@ public final class MultiClientInputMethodManagerService {
                 for (WindowInfo windowInfo : clientInfo.mWindowMap.values()) {
                     if (windowInfo.mWindowHandle == targetWindowHandle) {
                         final IBinder targetWindowToken = windowInfo.mWindowToken;
-                        // TODO(yukawa): Report targetWindowToken and targetWindowToken to WMS.
                         if (DEBUG) {
                             Slog.v(TAG, "reportImeWindowTarget"
                                     + " clientId=" + clientId
                                     + " imeWindowToken=" + imeWindowToken
                                     + " targetWindowToken=" + targetWindowToken);
                         }
+                        mIWindowManagerInternal.updateInputMethodTargetWindow(
+                                imeWindowToken, targetWindowToken);
                     }
                 }
                 // not found.
@@ -1490,6 +1491,9 @@ public final class MultiClientInputMethodManagerService {
                     case InputMethodClientState.ALREADY_SENT_BIND_RESULT:
                         try {
                             clientInfo.mMSInputMethodSession.showSoftInput(flags, resultReceiver);
+
+                            // Forcing WM to show IME on imeTargetWindow
+                            mWindowManagerInternal.showImePostLayout(token);
                         } catch (RemoteException e) {
                         }
                         break;