Merge "Allow color mode to be NOT_SET" into tm-qpr-dev (6ad1f71c) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/display/color/ColorDisplayService.java

+2 −0

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -16,11 +16,14 @@

		package com.android.server.display.color;

		import static com.google.common.truth.Truth.assertThat;
		import static com.google.common.truth.Truth.assertWithMessage;

		import static org.mockito.ArgumentMatchers.any;
		import static org.mockito.ArgumentMatchers.anyInt;
		import static org.mockito.ArgumentMatchers.eq;
		import static org.mockito.Mockito.doReturn;
		import static org.mockito.Mockito.never;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;

		@@ -1130,6 +1133,15 @@ public class ColorDisplayServiceTest {
		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.
		*