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

Commit 73d61274 authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge "Don't recompute display mode during a mode switch" into sc-dev am: 9d00fa87 am: 81062685 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie58af5a5cbee566acfc1c42e105c9eb007a23a90
parents a59cd02b 81062685

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

+8 −6
Original line number Original line Diff line number Diff line
@@ -4192,12 +4192,14 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        mInsetsStateController.getImeSourceProvider().checkShowImePostLayout();

        mInsetsStateController.getImeSourceProvider().checkShowImePostLayout();





        mLastHasContent = mTmpApplySurfaceChangesTransactionState.displayHasContent;

        mLastHasContent = mTmpApplySurfaceChangesTransactionState.displayHasContent;

        if (!mWmService.mDisplayFrozen) {

            mWmService.mDisplayManagerInternal.setDisplayProperties(mDisplayId,

            mWmService.mDisplayManagerInternal.setDisplayProperties(mDisplayId,

                    mLastHasContent,

                    mLastHasContent,

                    mTmpApplySurfaceChangesTransactionState.preferredRefreshRate,

                    mTmpApplySurfaceChangesTransactionState.preferredRefreshRate,

                    mTmpApplySurfaceChangesTransactionState.preferredModeId,

                    mTmpApplySurfaceChangesTransactionState.preferredModeId,

                    mTmpApplySurfaceChangesTransactionState.preferMinimalPostProcessing,

                    mTmpApplySurfaceChangesTransactionState.preferMinimalPostProcessing,

                    true /* inTraversal, must call performTraversalInTrans... below */);

                    true /* inTraversal, must call performTraversalInTrans... below */);

        }





        final boolean wallpaperVisible = mWallpaperController.isWallpaperVisible();

        final boolean wallpaperVisible = mWallpaperController.isWallpaperVisible();

        if (wallpaperVisible != mLastWallpaperVisible) {

        if (wallpaperVisible != mLastWallpaperVisible) {