Merge "Make sure display config is updated when cutout is changed" into tm-dev

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

@@ -1810,10 +1810,14 @@ public class DisplayPolicy {
     /**
      * Called when the resource overlays change.
      */
-    public void onOverlayChangedLw() {
+    void onOverlayChanged() {
         updateCurrentUserResources();
+        // Update the latest display size, cutout.
+        mDisplayContent.updateDisplayInfo();
+        // The height of status bar needs to update in case display cutout is changed.
         onConfigurationChanged();
-        mSystemGestures.onConfigurationChanged();
+        // The height of status bar can affect screen size configuration.
+        mDisplayContent.reconfigureDisplayLocked();
     }
 
     /**

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

@@ -6966,14 +6966,18 @@ 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) {
-            mRoot.forAllDisplays(displayContent -> {
+                mAtmService.deferWindowLayout();
-                displayContent.getDisplayPolicy().onOverlayChangedLw();
+                try {
-                displayContent.updateDisplayInfo();
+                    mRoot.forAllDisplays(dc -> dc.getDisplayPolicy().onOverlayChanged());
-            });
+                } finally {
-            requestTraversal();
+                    mAtmService.continueWindowLayout();
                 }
             }
+        });
+    }
 
     @Override
     public Object getWindowManagerLock() {