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

Commit f1c4b2ef authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't update desired display mode specs for disabled displays" into udc-dev

parents 17d7b4b2 ca58ae12

services/core/java/com/android/server/display/DisplayManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -4600,7 +4600,8 @@ public final class DisplayManagerService extends SystemService { 
        public void onDesiredDisplayModeSpecsChanged() {

            synchronized (mSyncRoot) {

                mChanged = false;

                mLogicalDisplayMapper.forEachLocked(mSpecsChangedConsumer);

                mLogicalDisplayMapper.forEachLocked(mSpecsChangedConsumer,

                        /* includeDisabled= */ false);

                if (mChanged) {

                    scheduleTraversalLocked(false);

                    mChanged = false;

services/core/java/com/android/server/display/LogicalDisplayMapper.java

+8 −1
Original line number Diff line number Diff line
@@ -302,9 +302,16 @@ class LogicalDisplayMapper implements DisplayDeviceRepository.Listener { 
    }



    public void forEachLocked(Consumer<LogicalDisplay> consumer) {

        forEachLocked(consumer, /* includeDisabled= */ true);

    }



    public void forEachLocked(Consumer<LogicalDisplay> consumer, boolean includeDisabled) {

        final int count = mLogicalDisplays.size();

        for (int i = 0; i < count; i++) {

            consumer.accept(mLogicalDisplays.valueAt(i));

            LogicalDisplay display = mLogicalDisplays.valueAt(i);

            if (display.isEnabledLocked() || includeDisabled) {

                consumer.accept(display);

            }

        }

    }