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

Merge "Allow color mode to be NOT_SET" into tm-qpr-dev

Browse Source
This commit is contained in:
Christine Franks
2022-06-24 15:36:20 +00:00
committed by Android (Google) Code Review
parent a8454ad2f2 efbefbc57f
commit 6ad1f71cce
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/display/color/ColorDisplayService.java
View File

@@ -956,6 +956,8 @@ public final class ColorDisplayService extends SystemService {
R.array.config_availableColorModes); R.array.config_availableColorModes);
if (availableColorModes.length > 0) { if (availableColorModes.length > 0) {
colorMode = availableColorModes[0]; colorMode = availableColorModes[0];
} else {
colorMode = NOT_SET;
} }
} }
} }

12
services/tests/servicestests/src/com/android/server/display/color/ColorDisplayServiceTest.java
View File

@@ -16,11 +16,14 @@
package com.android.server.display.color; package com.android.server.display.color;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage; import static com.google.common.truth.Truth.assertWithMessage;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -1130,6 +1133,15 @@ public class ColorDisplayServiceTest {
eq(ColorDisplayManager.COLOR_MODE_BOOSTED), any(), eq(Display.COLOR_MODE_INVALID)); eq(ColorDisplayManager.COLOR_MODE_BOOSTED), any(), eq(Display.COLOR_MODE_INVALID));
} }
@Test
public void getColorMode_noAvailableModes_returnsNotSet() {
when(mResourcesSpy.getIntArray(R.array.config_availableColorModes))
.thenReturn(new int[] {});
startService();
verify(mDisplayTransformManager, never()).setColorMode(anyInt(), any(), anyInt());
assertThat(mBinderService.getColorMode()).isEqualTo(-1);
}
/** /**
* Configures Night display to use a custom schedule. * Configures Night display to use a custom schedule.
* *