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

Commit c325dedc authored by Nick Chameyev's avatar Nick Chameyev
Browse files

Initialize DisplayUpdater with the initial display info 

DisplayManager#getNonOverrideDisplayInfo might not
set DisplayInfo values if the display doest not exist.
This causes problems when mDisplayInfo in DisplayUpdater
was never updated as it will emit empty DisplayInfo
if we call updateDisplayInfo when the display is
already removed.

The difference with the previous behavior is that
we initialized mDisplayInfo with initial values in
constructor of DisplayContent, so when we request
an update when the display is removed it would use
the old values to perform the update instead of
using 'empty' values.

Bug: 313307263
Test: manual fold/unfold, presubmit
Test: abtd run of CtsDisplayTestCases
Flag: none
Change-Id: I6b09e00b3d7d0fabb45b4df8f747fa5f62b6342d
parent 0d0ce5f0

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

+1 −1
Original line number Diff line number Diff line
@@ -1153,12 +1153,12 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        mDisplay = display;

        mDisplayId = display.getDisplayId();

        mCurrentUniqueDisplayId = display.getUniqueId();

        mDisplayUpdater = new ImmediateDisplayUpdater(this);

        mOffTokenAcquirer = mRootWindowContainer.mDisplayOffTokenAcquirer;

        mWallpaperController = new WallpaperController(mWmService, this);

        mWallpaperController.resetLargestDisplay(display);

        display.getDisplayInfo(mDisplayInfo);

        display.getMetrics(mDisplayMetrics);

        mDisplayUpdater = new ImmediateDisplayUpdater(this);

        mSystemGestureExclusionLimit = mWmService.mConstants.mSystemGestureExclusionLimitDp

                * mDisplayMetrics.densityDpi / DENSITY_DEFAULT;

        isDefaultDisplay = mDisplayId == DEFAULT_DISPLAY;

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

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ public class ImmediateDisplayUpdater implements DisplayUpdater { 


    public ImmediateDisplayUpdater(@NonNull DisplayContent displayContent) {

        mDisplayContent = displayContent;

        mDisplayInfo.copyFrom(mDisplayContent.getDisplayInfo());

    }



    @Override