Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix broken test

Browse Source 
Fix LocalDisplayAdapterTeset#testAfterDisplayChange_ModesAreUpdated

Test: atest LocaLDisplayAdapterTest
Change-Id: Ie77cc5321f07bd37784858fed1eddbc84427f3d8
This commit is contained in:
Marin Shalamanov
2020-10-28 14:20:26 +01:00
parent e7ffa5eeae
commit 78b5f90d4a
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/display/LocalDisplayAdapter.java
View File

@@ -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) {