commit 6f68248158d572c0aee93ada245749fae8d7567e
author Tiger Huang <tigerhuang@google.com> Tue Nov 30 22:41:45 2021 +0800
committer Tiger Huang <tigerhuang@google.com> Wed Dec 01 23:54:26 2021 +0800
tree 691825be1bbebeb5411ecb0e2331d27b8bb03456
parent 86ef373a37df7d3cc923eecba6b40a7b7548f3d9

Move win.skipLayout into policy.layoutWindowLw

This CL restore the previous logic to skip layout but still update
mLayoutSeq. In this way, we can still report resized to the client.

Fix: 207144283
Test: atest PinnedStackTests#testTranslucentActivityOnTopOfPinnedTask
Change-Id: I5a4a09899fef194d002a7e74bc4ad64685d4e689

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

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 42c8124..c81a82e 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -800,7 +800,7 @@
     };
 
     private final Consumer<WindowState> mPerformLayout = w -> {
-        if (w.mLayoutAttached || w.skipLayout()) {
+        if (w.mLayoutAttached) {
             return;
         }
 
@@ -858,7 +858,7 @@
     };
 
     private final Consumer<WindowState> mPerformLayoutAttached = w -> {
-        if (!w.mLayoutAttached || w.skipLayout()) {
+        if (!w.mLayoutAttached) {
             return;
         }
         if (DEBUG_LAYOUT) Slog.v(TAG, "2ND PASS " + w + " mHaveFrame=" + w.mHaveFrame

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

diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
index a492b7a..dda50af 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -1490,6 +1490,9 @@
      * @param displayFrames The display frames.
      */
     public void layoutWindowLw(WindowState win, WindowState attached, DisplayFrames displayFrames) {
+        if (win.skipLayout()) {
+            return;
+        }
 
         // This window might be in the simulated environment.
         // We invoke this to get the proper DisplayFrames.