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

Commit 75bf015b authored by Riddle Hsu's avatar Riddle Hsu
Browse files

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

This reverts commit 08a30491.

Reason for revert: b/227625246

Change-Id: If26a4b602d29e387ac7150edbedd7ddc5a6d7372
parent 08a30491

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

+2 −6
Original line number Diff line number Diff line
@@ -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();

    }



    /**

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

+7 −11
Original line number Diff line number Diff line
@@ -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();

                }

            }

            mRoot.forAllDisplays(displayContent -> {

                displayContent.getDisplayPolicy().onOverlayChangedLw();

                displayContent.updateDisplayInfo();

            });

            requestTraversal();

        }

    }



    @Override