Merge "Only hide ime leash for invisible ime control target" into main

1 files changed, 4 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java
index 989888ee3ac3..1543263c0e89 100644
--- a/services/core/java/com/android/server/wm/Transition.java
+++ b/services/core/java/com/android/server/wm/Transition.java
@@ -1554,11 +1554,14 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
         // but InsetsStateController#notifyControlTargetChanged still waits for IME to redraw.
         final InsetsSourceProvider sourceProvider = imeWindow.getControllableInsetProvider();
         if (sourceProvider == null || sourceProvider.mControl == null
+                || !sourceProvider.isClientVisible()
                 || imeTarget == sourceProvider.getControlTarget()) {
             return;
         }
         final SurfaceControl imeInsetsLeash = sourceProvider.mControl.getLeash();
-        if (imeInsetsLeash != null) {
+        final InsetsControlTarget controlTarget = sourceProvider.getControlTarget();
+        if (imeInsetsLeash != null && controlTarget != null && controlTarget.getWindow() != null
+                && !controlTarget.getWindow().mToken.isVisible()) {
             dc.getSyncTransaction().reparent(imeInsetsLeash, null);
         }
     }