Merge "Reduce RBC test flakiness" into sc-dev

This commit is contained in:
Sally Yuen
2021-03-22 16:27:49 +00:00
committed by Android (Google) Code Review

View File

@@ -24,7 +24,6 @@ import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
import android.hardware.display.ColorDisplayManager;
import android.provider.Settings; import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
@@ -83,8 +82,8 @@ public class ReduceBrightColorsIntensityPreferenceControllerTest {
Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED, 1); Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED, 1);
mPreferenceController.onPreferenceChange(/* preference= */ null, 20); mPreferenceController.onPreferenceChange(/* preference= */ null, 20);
assertThat( assertThat(
mContext.getSystemService( Settings.Secure.getInt(mContext.getContentResolver(),
ColorDisplayManager.class).getReduceBrightColorsStrength()) Settings.Secure.REDUCE_BRIGHT_COLORS_LEVEL, 0))
.isEqualTo(20); .isEqualTo(20);
} }