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

Commit 8fd7533e authored by Oleg Blinnikov's avatar Oleg Blinnikov
Browse files

Re-initialize default display on type change 

When the default display's type changes, such as when switching from an internal to an external display as the default, trigger the display added logic to ensure all display mode configurations are properly updated for the new display type.

Bug: 436846760
Test: atest DisplayObserverTest
Flag: EXEMPT simple bugfix
Change-Id: Ib8680cbe38d1c39af0d70f83e9f3cb3c5d3c9a45
parent 89cf0eb1

services/core/java/com/android/server/display/mode/DisplayModeDirector.java

+12 −0
Original line number Diff line number Diff line
@@ -1408,6 +1408,7 @@ public class DisplayModeDirector { 
        private int mExternalDisplayPeakHeight;

        private int mExternalDisplayPeakRefreshRate;

        private final boolean mRefreshRateSynchronizationEnabled;

        private int mDefaultDisplayType = Display.TYPE_INTERNAL;



        DisplayObserver(Context context, Handler handler, VotesStorage votesStorage,

                Injector injector) {
@@ -1480,6 +1481,9 @@ public class DisplayModeDirector { 
            if (displayInfo == null) {

                return;

            }

            if (displayId == Display.DEFAULT_DISPLAY) {

                mDefaultDisplayType = displayInfo.type;

            }

            updateDisplayDeviceConfig(displayId);

            registerExternalDisplay(displayInfo);

            updateDisplayModes(displayId, displayInfo);
@@ -1511,6 +1515,14 @@ public class DisplayModeDirector { 
            if (displayInfo == null) {

                return;

            }

            if (displayId == Display.DEFAULT_DISPLAY && displayInfo.type != mDefaultDisplayType) {

                // If the default display's type changes (e.g. from internal to external),

                // treat it as a new display being added to ensure all configurations are

                // re-initialized correctly for the new display type.

                onDisplayRemoved(displayId);

                onDisplayAdded(displayId);

                return;

            }

            updateDisplayDeviceConfig(displayId);

            updateHasArrSupport(displayId, displayInfo);

            updateDisplayModes(displayId, displayInfo);

services/tests/displayservicetests/src/com/android/server/display/mode/DisplayObserverTest.java

+202 −122

File changed.

Preview size limit exceeded, changes collapsed.