commit 4412e2342f6f8c6a4ed57dd30ebb3ad033af4eeb
author chaviw <chaviw@google.com> Tue Apr 21 17:27:23 2020 -0700
committer chaviw <chaviw@google.com> Thu Apr 23 14:27:32 2020 -0700
tree dc2c0a073f46014029c3474c96f3a79b22f85aa4
parent 8650e9aa11e3ad5c72b11e651170060d9fa19cde

Fix some issues with applySyncTransaction

1. Sometimes there are windows that don't need to be re-drawn when
there's a config change. In those cases, system server will still wait
on those clients to notify that it's completed drawing. Therefore, we
force clients to report draw when blast sync is enabled, meaning the
server is waiting for all clients to draw.

2. If a window is removed during a syncTransaction, the server will
continue waiting but the client will never report back. Therefore, call
finishDrawing when a window is removed

3. Ensure performSurfacePlacement is called when there has been a config
change as a result of applyTransaction

Test: Tested with DisplayAreaOrganizer and syncTransaction
Bug: 152114574
Change-Id: Ib725e6ae1da4e37184c34759baea2fe8e0d5c02a

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

diff --git a/services/core/java/com/android/server/wm/WindowOrganizerController.java b/services/core/java/com/android/server/wm/WindowOrganizerController.java
index 160978d..1784e21 100644
--- a/services/core/java/com/android/server/wm/WindowOrganizerController.java
+++ b/services/core/java/com/android/server/wm/WindowOrganizerController.java
@@ -19,6 +19,7 @@
 import static android.Manifest.permission.MANAGE_ACTIVITY_STACKS;
 
 import static com.android.server.wm.ActivityStackSupervisor.PRESERVE_WINDOWS;
+import static com.android.server.wm.ActivityTaskManagerService.LAYOUT_REASON_CONFIG_CHANGED;
 import static com.android.server.wm.Task.FLAG_FORCE_HIDDEN_FOR_TASK_ORG;
 import static com.android.server.wm.WindowContainer.POSITION_BOTTOM;
 import static com.android.server.wm.WindowContainer.POSITION_TOP;
@@ -173,6 +174,10 @@
                             f.recycle();
                         }
                     }
+
+                    if ((effects & TRANSACT_EFFECTS_CLIENT_CONFIG) == 0) {
+                        mService.addWindowLayoutReasons(LAYOUT_REASON_CONFIG_CHANGED);
+                    }
                 } finally {
                     mService.continueWindowLayout();
                     if (syncId >= 0) {

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

diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index ef690e1..905bba2 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -2114,6 +2114,7 @@
     void removeIfPossible() {
         super.removeIfPossible();
         removeIfPossible(false /*keepVisibleDeadWindow*/);
+        finishDrawing(null);
     }
 
     private void removeIfPossible(boolean keepVisibleDeadWindow) {
@@ -3454,7 +3455,7 @@
         final Rect visibleInsets = mWindowFrames.mLastVisibleInsets;
         final Rect stableInsets = mWindowFrames.mLastStableInsets;
         final MergedConfiguration mergedConfiguration = mLastReportedConfiguration;
-        final boolean reportDraw = mWinAnimator.mDrawState == DRAW_PENDING;
+        final boolean reportDraw = mWinAnimator.mDrawState == DRAW_PENDING || useBLASTSync();
         final boolean forceRelayout = reportOrientation || isDragResizeChanged();
         final int displayId = getDisplayId();
         final DisplayCutout displayCutout = getWmDisplayCutout().getDisplayCutout();