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

Merge "Update BrightnessTrackerTest" into sc-dev

Browse Source
This commit is contained in:
Christine Franks
2021-03-09 22:19:58 +00:00
committed by Android (Google) Code Review
parent 5ef41d061b 03574f62bb
commit a8ef1df970
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
services/tests/servicestests/src/com/android/server/display/BrightnessTrackerTest.java
View File

@@ -38,6 +38,7 @@ import android.hardware.SensorEventListener;
import android.hardware.display.AmbientBrightnessDayStats; import android.hardware.display.AmbientBrightnessDayStats;
import android.hardware.display.BrightnessChangeEvent; import android.hardware.display.BrightnessChangeEvent;
import android.hardware.display.BrightnessConfiguration; import android.hardware.display.BrightnessConfiguration;
import android.hardware.display.ColorDisplayManager;
import android.hardware.display.DisplayManager; import android.hardware.display.DisplayManager;
import android.hardware.display.DisplayedContentSample; import android.hardware.display.DisplayedContentSample;
import android.hardware.display.DisplayedContentSamplingAttributes; import android.hardware.display.DisplayedContentSamplingAttributes;
@@ -91,6 +92,7 @@ public class BrightnessTrackerTest {
new HandlerThread("brightness.test", android.os.Process.THREAD_PRIORITY_BACKGROUND); new HandlerThread("brightness.test", android.os.Process.THREAD_PRIORITY_BACKGROUND);
private int mDefaultNightModeColorTemperature; private int mDefaultNightModeColorTemperature;
private float mRbcOffsetFactor;
private static Handler ensureHandler() { private static Handler ensureHandler() {
synchronized (sHandlerLock) { synchronized (sHandlerLock) {
@@ -111,6 +113,8 @@ public class BrightnessTrackerTest {
mDefaultNightModeColorTemperature = mDefaultNightModeColorTemperature =
InstrumentationRegistry.getContext().getResources().getInteger( InstrumentationRegistry.getContext().getResources().getInteger(
R.integer.config_nightDisplayColorTemperatureDefault); R.integer.config_nightDisplayColorTemperatureDefault);
mRbcOffsetFactor = InstrumentationRegistry.getContext()
.getSystemService(ColorDisplayManager.class).getReduceBrightColorsOffsetFactor();
} }
@Test @Test
@@ -314,6 +318,9 @@ public class BrightnessTrackerTest {
mInjector.mSecureIntSettings.put(Settings.Secure.NIGHT_DISPLAY_ACTIVATED, 1); mInjector.mSecureIntSettings.put(Settings.Secure.NIGHT_DISPLAY_ACTIVATED, 1);
mInjector.mSecureIntSettings.put(Settings.Secure.NIGHT_DISPLAY_COLOR_TEMPERATURE, 3333); mInjector.mSecureIntSettings.put(Settings.Secure.NIGHT_DISPLAY_COLOR_TEMPERATURE, 3333);
mInjector.mSecureIntSettings.put(Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED, 1);
mInjector.mSecureIntSettings.put(Settings.Secure.REDUCE_BRIGHT_COLORS_LEVEL, 40);
startTracker(mTracker, initialBrightness, DEFAULT_COLOR_SAMPLING_ENABLED); startTracker(mTracker, initialBrightness, DEFAULT_COLOR_SAMPLING_ENABLED);
mInjector.mBroadcastReceiver.onReceive(InstrumentationRegistry.getContext(), mInjector.mBroadcastReceiver.onReceive(InstrumentationRegistry.getContext(),
batteryChangeEvent(30, 60)); batteryChangeEvent(30, 60));
@@ -337,7 +344,7 @@ public class BrightnessTrackerTest {
assertEquals(3333, event.colorTemperature); assertEquals(3333, event.colorTemperature);
assertTrue(event.reduceBrightColors); assertTrue(event.reduceBrightColors);
assertEquals(40, event.reduceBrightColorsStrength); assertEquals(40, event.reduceBrightColorsStrength);
assertEquals(20f, event.reduceBrightColorsOffset, FLOAT_DELTA); assertEquals(brightness * mRbcOffsetFactor, event.reduceBrightColorsOffset, FLOAT_DELTA);
assertEquals("a.package", event.packageName); assertEquals("a.package", event.packageName);
assertEquals(0, event.userId); assertEquals(0, event.userId);
assertArrayEquals(new long[] {1, 10, 100, 1000, 300, 30, 10, 1}, event.colorValueBuckets); assertArrayEquals(new long[] {1, 10, 100, 1000, 300, 30, 10, 1}, event.colorValueBuckets);
@@ -445,7 +452,9 @@ public class BrightnessTrackerTest {
+ Long.toString(someTimeAgo) + "\" packageName=\"" + Long.toString(someTimeAgo) + "\" packageName=\""
+ "com.example.app\" user=\"10\" " + "com.example.app\" user=\"10\" "
+ "lastNits=\"32.333\" " + "lastNits=\"32.333\" "
+ "batteryLevel=\"1.0\" nightMode=\"false\" colorTemperature=\"0\"\n" + "batteryLevel=\"1.0\" nightMode=\"false\" colorTemperature=\"0\" "
+ "reduceBrightColors=\"false\" reduceBrightColorsStrength=\"40\" "
+ "reduceBrightColorsOffset=\"0\"\n"
+ "lux=\"32.2,31.1\" luxTimestamps=\"" + "lux=\"32.2,31.1\" luxTimestamps=\""
+ Long.toString(someTimeAgo) + "," + Long.toString(someTimeAgo) + "\"" + Long.toString(someTimeAgo) + "," + Long.toString(someTimeAgo) + "\""
+ "defaultConfig=\"true\" powerSaveFactor=\"0.5\" userPoint=\"true\" />" + "defaultConfig=\"true\" powerSaveFactor=\"0.5\" userPoint=\"true\" />"
@@ -453,7 +462,9 @@ public class BrightnessTrackerTest {
+ Long.toString(someTimeAgo) + "\" packageName=\"" + Long.toString(someTimeAgo) + "\" packageName=\""
+ "com.android.anapp\" user=\"11\" " + "com.android.anapp\" user=\"11\" "
+ "lastNits=\"32\" " + "lastNits=\"32\" "
+ "batteryLevel=\"0.5\" nightMode=\"true\" colorTemperature=\"3235\"\n" + "batteryLevel=\"0.5\" nightMode=\"true\" colorTemperature=\"3235\" "
+ "reduceBrightColors=\"true\" reduceBrightColorsStrength=\"40\" "
+ "reduceBrightColorsOffset=\"0\"\n"
+ "lux=\"132.2,131.1\" luxTimestamps=\"" + "lux=\"132.2,131.1\" luxTimestamps=\""
+ Long.toString(someTimeAgo) + "," + Long.toString(someTimeAgo) + "\"" + Long.toString(someTimeAgo) + "," + Long.toString(someTimeAgo) + "\""
+ "colorSampleDuration=\"3456\" colorValueBuckets=\"123,598,23,19\"/>" + "colorSampleDuration=\"3456\" colorValueBuckets=\"123,598,23,19\"/>"
@@ -462,7 +473,9 @@ public class BrightnessTrackerTest {
+ Long.toString(twoMonthsAgo) + "\" packageName=\"" + Long.toString(twoMonthsAgo) + "\" packageName=\""
+ "com.example.app\" user=\"10\" " + "com.example.app\" user=\"10\" "
+ "lastNits=\"32\" " + "lastNits=\"32\" "
+ "batteryLevel=\"1.0\" nightMode=\"false\" colorTemperature=\"0\"\n" + "batteryLevel=\"1.0\" nightMode=\"false\" colorTemperature=\"0\" "
+ "reduceBrightColors=\"false\" reduceBrightColorsStrength=\"40\" "
+ "reduceBrightColorsOffset=\"0\"\n"
+ "lux=\"32.2,31.1\" luxTimestamps=\"" + "lux=\"32.2,31.1\" luxTimestamps=\""
+ Long.toString(twoMonthsAgo) + "," + Long.toString(twoMonthsAgo) + "\"/>" + Long.toString(twoMonthsAgo) + "," + Long.toString(twoMonthsAgo) + "\"/>"
+ "</events>"; + "</events>";
@@ -477,6 +490,7 @@ public class BrightnessTrackerTest {
assertEquals(32.333, event.lastBrightness, FLOAT_DELTA); assertEquals(32.333, event.lastBrightness, FLOAT_DELTA);
assertEquals(0, event.userId); assertEquals(0, event.userId);
assertFalse(event.nightMode); assertFalse(event.nightMode);
assertFalse(event.reduceBrightColors);
assertEquals(1.0f, event.batteryLevel, FLOAT_DELTA); assertEquals(1.0f, event.batteryLevel, FLOAT_DELTA);
assertEquals("com.example.app", event.packageName); assertEquals("com.example.app", event.packageName);
assertTrue(event.isDefaultBrightnessConfig); assertTrue(event.isDefaultBrightnessConfig);
@@ -495,6 +509,7 @@ public class BrightnessTrackerTest {
assertEquals(1, event.userId); assertEquals(1, event.userId);
assertTrue(event.nightMode); assertTrue(event.nightMode);
assertEquals(3235, event.colorTemperature); assertEquals(3235, event.colorTemperature);
assertTrue(event.reduceBrightColors);
assertEquals(0.5f, event.batteryLevel, FLOAT_DELTA); assertEquals(0.5f, event.batteryLevel, FLOAT_DELTA);
assertEquals("com.android.anapp", event.packageName); assertEquals("com.android.anapp", event.packageName);
// Not present in the event so default to false. // Not present in the event so default to false.
@@ -600,7 +615,7 @@ public class BrightnessTrackerTest {
assertEquals(3339, event.colorTemperature); assertEquals(3339, event.colorTemperature);
assertTrue(event.reduceBrightColors); assertTrue(event.reduceBrightColors);
assertEquals(40, event.reduceBrightColorsStrength); assertEquals(40, event.reduceBrightColorsStrength);
assertEquals(20f, event.reduceBrightColorsOffset, FLOAT_DELTA); assertEquals(brightness * mRbcOffsetFactor, event.reduceBrightColorsOffset, FLOAT_DELTA);
assertEquals(0.5f, event.powerBrightnessFactor, FLOAT_DELTA); assertEquals(0.5f, event.powerBrightnessFactor, FLOAT_DELTA);
assertTrue(event.isUserSetBrightness); assertTrue(event.isUserSetBrightness);
assertFalse(event.isDefaultBrightnessConfig); assertFalse(event.isDefaultBrightnessConfig);