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

Commit b99b2012 authored by Marin Shalamanov's avatar Marin Shalamanov Committed by Android (Google) Code Review
Browse files

Merge "Fix broken test"

parents 5899fe41 78b5f90d

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

+1 −2
Original line number Diff line number Diff line
@@ -351,10 +351,9 @@ final class LocalDisplayAdapter extends DisplayAdapter { 
            if (mDefaultModeId == NO_DISPLAY_MODE_ID) {

                mDefaultModeId = activeRecord.mMode.getModeId();

                mDefaultConfigGroup = configs[activeConfigId].configGroup;

            } else if (modesAdded && mActiveModeId != activeRecord.mMode.getModeId()) {

            } else if (modesAdded && activeModeChanged) {

                Slog.d(TAG, "New display modes are added and the active mode has changed, "

                        + "use active mode as default mode.");

                mActiveModeId = activeRecord.mMode.getModeId();

                mDefaultModeId = activeRecord.mMode.getModeId();

                mDefaultConfigGroup = configs[activeConfigId].configGroup;

            } else if (findDisplayConfigIdLocked(mDefaultModeId, mDefaultConfigGroup) < 0) {