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

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

Merge "Get the latest display info for overlay change" into tm-qpr-dev am: 3ad54047 

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



Change-Id: Id2f38b8302ee3c9fea4c60cdac93ff74b63f686f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e8359bcd 3ad54047

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

+3 −1
Original line number Diff line number Diff line
@@ -1900,8 +1900,10 @@ public class DisplayPolicy { 
    /**

     * Called when the resource overlays change.

     */

    public void onOverlayChangedLw() {

    void onOverlayChanged() {

        updateCurrentUserResources();

        // Update the latest display size, cutout.

        mDisplayContent.updateDisplayInfo();

        onConfigurationChanged();

        mSystemGestures.onConfigurationChanged();

    }

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

+8 −7
Original line number Diff line number Diff line
@@ -7046,13 +7046,14 @@ 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 -> {

                displayContent.getDisplayPolicy().onOverlayChangedLw();

                displayContent.updateDisplayInfo();

            });

            requestTraversal();

                mAtmService.deferWindowLayout();

                mRoot.forAllDisplays(dc -> dc.getDisplayPolicy().onOverlayChanged());

                mAtmService.continueWindowLayout();

            }

        });

    }



    @Override