commit f768ea538f0fcb1a43ec3ac348ace5212f42ee29
author Jorim Jaggi <jjaggi@google.com> Thu Jan 30 23:45:23 2020 +0100
committer Jorim Jaggi <jjaggi@google.com> Fri Jan 31 17:24:19 2020 +0100
tree 266a2dfef47da5a8fecc660f164cffc41323372e
parent b29730fc9b687605d4e3cadd3d27bc98d529867c

When no IME target, use empty control target

...such that IME doesn't show up if there is no target. It would
show because we don't attach it to a leash.

Test: Open any app while IME was previously open
Bug: 111084606
Change-Id: I1d99af44157244538f9ba95ba8daf6576a851e19

services/core/java/com/android/server/wm/InsetsStateController.java

diff --git a/services/core/java/com/android/server/wm/InsetsStateController.java b/services/core/java/com/android/server/wm/InsetsStateController.java
index 568966a..289ac4c 100644
--- a/services/core/java/com/android/server/wm/InsetsStateController.java
+++ b/services/core/java/com/android/server/wm/InsetsStateController.java
@@ -60,6 +60,8 @@
             w.notifyInsetsChanged();
         }
     };
+    private final InsetsControlTarget mEmptyImeControlTarget = () -> {
+    };
 
     InsetsStateController(DisplayContent displayContent) {
         mDisplayContent = displayContent;
@@ -182,7 +184,10 @@
     }
 
     void onImeControlTargetChanged(@Nullable InsetsControlTarget imeTarget) {
-        onControlChanged(ITYPE_IME, imeTarget);
+
+        // Make sure that we always have a control target for the IME, even if the IME target is
+        // null. Otherwise there is no leash that will hide it and IME becomes "randomly" visible.
+        onControlChanged(ITYPE_IME, imeTarget != null ? imeTarget : mEmptyImeControlTarget);
         notifyPendingInsetsControlChanged();
     }