From 75bf015ba562b0d3249f5e3dce423b9507ffff12 Mon Sep 17 00:00:00 2001
From: Riddle Hsu <riddlehsu@google.com>
Date: Fri, 1 Apr 2022 14:50:16 +0000
Subject: [PATCH] Revert "Make sure display config is updated when cutout is
 changed"

This reverts commit 08a304912637c0fa55e087762bc40ca9df2fce56.

Reason for revert: b/227625246

Change-Id: If26a4b602d29e387ac7150edbedd7ddc5a6d7372
---
 .../com/android/server/wm/DisplayPolicy.java   |  8 ++------
 .../server/wm/WindowManagerService.java        | 18 +++++++-----------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
index c6bfe8ba253cd..4573ede13f7f5 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -1814,14 +1814,10 @@ public class DisplayPolicy {
     /**
      * Called when the resource overlays change.
      */
-    void onOverlayChanged() {
+    public void onOverlayChangedLw() {
         updateCurrentUserResources();
-        // Update the latest display size, cutout.
-        mDisplayContent.updateDisplayInfo();
-        // The height of status bar needs to update in case display cutout is changed.
         onConfigurationChanged();
-        // The height of status bar can affect screen size configuration.
-        mDisplayContent.reconfigureDisplayLocked();
+        mSystemGestures.onConfigurationChanged();
     }
 
     /**
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index d7498b757124a..451e777387450 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -6967,17 +6967,13 @@ public class WindowManagerService extends IWindowManager.Stub
     }
 
     public void onOverlayChanged() {
-        // Post to display thread so it can get the latest display info.
-        mH.post(() -> {
-            synchronized (mGlobalLock) {
-                mAtmService.deferWindowLayout();
-                try {
-                    mRoot.forAllDisplays(dc -> dc.getDisplayPolicy().onOverlayChanged());
-                } finally {
-                    mAtmService.continueWindowLayout();
-                }
-            }
-        });
+        synchronized (mGlobalLock) {
+            mRoot.forAllDisplays(displayContent -> {
+                displayContent.getDisplayPolicy().onOverlayChangedLw();
+                displayContent.updateDisplayInfo();
+            });
+            requestTraversal();
+        }
     }
 
     @Override