Merge "Fix broken ColorDisplayServiceTest cases" into qt-r1-dev (ccfefe62) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -226,7 +226,7 @@ public final class ColorDisplayService extends SystemService {
		}
		}

		private void onUserChanged(int userHandle) {
		@VisibleForTesting void onUserChanged(int userHandle) {
		final ContentResolver cr = getContext().getContentResolver();

		if (mCurrentUser != UserHandle.USER_NULL) {

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

+17 −24

Original line number	Diff line number	Diff line
		@@ -113,6 +113,8 @@ public class ColorDisplayServiceTest {
		mUserId = UserHandle.USER_NULL;
		mContext = null;

		FakeSettingsProvider.clearSettingsProvider();

		LocalServices.removeServiceForTest(ColorDisplayService.ColorDisplayServiceInternal.class);
		}

		@@ -924,11 +926,8 @@ public class ColorDisplayServiceTest {

		startService();
		assertUserColorMode(ColorDisplayManager.COLOR_MODE_NATURAL);
		if (isColorModeValid(ColorDisplayManager.COLOR_MODE_SATURATED)) {
		assertActiveColorMode(ColorDisplayManager.COLOR_MODE_SATURATED);
		} else if (isColorModeValid(ColorDisplayManager.COLOR_MODE_AUTOMATIC)) {
		assertActiveColorMode(ColorDisplayManager.COLOR_MODE_AUTOMATIC);
		}
		assertActiveColorMode(mContext.getResources().getInteger(
		R.integer.config_accessibilityColorMode));
		}

		@Test
		@@ -942,11 +941,8 @@ public class ColorDisplayServiceTest {

		startService();
		assertUserColorMode(ColorDisplayManager.COLOR_MODE_NATURAL);
		if (isColorModeValid(ColorDisplayManager.COLOR_MODE_SATURATED)) {
		assertActiveColorMode(ColorDisplayManager.COLOR_MODE_SATURATED);
		} else if (isColorModeValid(ColorDisplayManager.COLOR_MODE_AUTOMATIC)) {
		assertActiveColorMode(ColorDisplayManager.COLOR_MODE_AUTOMATIC);
		}
		assertActiveColorMode(mContext.getResources().getInteger(
		R.integer.config_accessibilityColorMode));
		}

		@Test
		@@ -961,11 +957,8 @@ public class ColorDisplayServiceTest {

		startService();
		assertUserColorMode(ColorDisplayManager.COLOR_MODE_NATURAL);
		if (isColorModeValid(ColorDisplayManager.COLOR_MODE_SATURATED)) {
		assertActiveColorMode(ColorDisplayManager.COLOR_MODE_SATURATED);
		} else if (isColorModeValid(ColorDisplayManager.COLOR_MODE_AUTOMATIC)) {
		assertActiveColorMode(ColorDisplayManager.COLOR_MODE_AUTOMATIC);
		}
		assertActiveColorMode(mContext.getResources().getInteger(
		R.integer.config_accessibilityColorMode));
		}

		@Test
		@@ -1020,11 +1013,15 @@ public class ColorDisplayServiceTest {

		@Test
		public void displayWhiteBalance_enabledAfterLinearColorModeSelected() {
		if (!isColorModeValid(ColorDisplayManager.COLOR_MODE_SATURATED)) {
		return;
		}
		setDisplayWhiteBalanceEnabled(true);
		setNightDisplayActivated(false /* activated /, -30 / lastActivatedTimeOffset */);
		mBinderService.setColorMode(ColorDisplayManager.COLOR_MODE_SATURATED);
		startService();
		mBinderService.setColorMode(ColorDisplayManager.COLOR_MODE_NATURAL);
		assertDwbActive(false);

		mBinderService.setColorMode(ColorDisplayManager.COLOR_MODE_NATURAL);
		mCds.updateDisplayWhiteBalanceStatus();
		assertDwbActive(true);
		}
		@@ -1032,10 +1029,8 @@ public class ColorDisplayServiceTest {
		@Test
		public void displayWhiteBalance_disabledWhileAccessibilityColorCorrectionEnabled() {
		setDisplayWhiteBalanceEnabled(true);
		startService();
		setAccessibilityColorCorrection(true);

		mCds.updateDisplayWhiteBalanceStatus();
		startService();
		assertDwbActive(false);

		setAccessibilityColorCorrection(false);
		@@ -1046,10 +1041,8 @@ public class ColorDisplayServiceTest {
		@Test
		public void displayWhiteBalance_disabledWhileAccessibilityColorInversionEnabled() {
		setDisplayWhiteBalanceEnabled(true);
		startService();
		setAccessibilityColorInversion(true);

		mCds.updateDisplayWhiteBalanceStatus();
		startService();
		assertDwbActive(false);

		setAccessibilityColorInversion(false);
		@@ -1159,7 +1152,7 @@ public class ColorDisplayServiceTest {

		InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
		mCds.onBootPhase(SystemService.PHASE_BOOT_COMPLETED);
		mCds.onStartUser(mUserId);
		mCds.onUserChanged(mUserId);
		});
		}