Merge "Revert "Make sure display config is updated when cutout is changed"" into tm-dev (4ca3b323) · Commits · e / os / android_frameworks_base

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

+2 −6

Original line number	Diff line number	Diff line
		@@ -1810,14 +1810,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();
		}

		/**

+7 −11

Original line number	Diff line number	Diff line
		@@ -6976,17 +6976,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();
		}
		}
		mRoot.forAllDisplays(displayContent -> {
		displayContent.getDisplayPolicy().onOverlayChangedLw();
		displayContent.updateDisplayInfo();
		});
		requestTraversal();
		}
		}

		@Override