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

Merge "Fix broken ColorDisplayServiceTest cases" into qt-r1-dev

Browse Source 
am: f351094e88

Change-Id: I1dd114df9ab2a86fbba730685e9dd67f3064363f
This commit is contained in:
Christine Franks
2019-06-20 14:08:43 -07:00
committed by android-build-merger
parent bef7ff11e2 f351094e88
commit 8646d29c9d
2 changed files with 18 additions and 25 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

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

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

@@ -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);
});
}