From 78b5f90d4aa468afbca059353f00119ba8ff5b1d Mon Sep 17 00:00:00 2001
From: Marin Shalamanov <shalamanov@google.com>
Date: Wed, 28 Oct 2020 14:20:26 +0100
Subject: [PATCH] Fix broken test

Fix LocalDisplayAdapterTeset#testAfterDisplayChange_ModesAreUpdated

Test: atest LocaLDisplayAdapterTest
Change-Id: Ie77cc5321f07bd37784858fed1eddbc84427f3d8
---
 .../java/com/android/server/display/LocalDisplayAdapter.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
index 86691848c363d..c5ef6da36d1cb 100644
--- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
@@ -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) {