Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0f6a156 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Revert "Make sure display config is updated when cutout is changed""... 

Merge "Revert "Make sure display config is updated when cutout is changed"" into tm-dev am: 4ca3b323 am: 0f46340d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17536674



Change-Id: I3425a1f0ed9da2036fcc4ff7b9768fdc0d6aca09
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c9675508 0f46340d

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();

    }



    /**

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

+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