From 62ea2cf5c79096cce17c444b32c25172febb6e9b Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Thu, 16 Apr 2020 00:22:28 +0200
Subject: [PATCH] Perform layout when IME target changes

WindowState.mBehindIme may change depending on the IME target, so
we need to redo a layout.

Test: InsetsStateControllerTest
Fixes: 153576698
Change-Id: I64df22c3f0c46e9aed021aae6177e1c44d0cd96c
---
 services/core/java/com/android/server/wm/DisplayContent.java    | 2 +-
 .../src/com/android/server/wm/InsetsStateControllerTest.java    | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 2a676e1de5afb..89985e85452af 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -3440,7 +3440,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
 
         mInputMethodTarget = target;
         mInputMethodTargetWaitingAnim = targetWaitingAnim;
-        assignWindowLayers(false /* setLayoutNeeded */);
+        assignWindowLayers(true /* setLayoutNeeded */);
         updateImeParent();
         updateImeControlTarget();
     }
diff --git a/services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java
index 61b74b0c1d0fe..8369eb7a82f07 100644
--- a/services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java
@@ -188,7 +188,6 @@ public class InsetsStateControllerTest extends WindowTestsBase {
         // Adding FLAG_NOT_FOCUSABLE makes app above IME.
         app.mAttrs.flags |= FLAG_NOT_FOCUSABLE;
         mDisplayContent.computeImeTarget(true);
-        mDisplayContent.setLayoutNeeded();
         mDisplayContent.applySurfaceChangesTransaction();
 
         // app won't get IME insets while above IME.
@@ -200,7 +199,6 @@ public class InsetsStateControllerTest extends WindowTestsBase {
         // Removing FLAG_NOT_FOCUSABLE makes app below IME.
         app.mAttrs.flags &= ~FLAG_NOT_FOCUSABLE;
         mDisplayContent.computeImeTarget(true);
-        mDisplayContent.setLayoutNeeded();
         mDisplayContent.applySurfaceChangesTransaction();
 
         // Make sure app got notified.