RESTRICT AUTOMERGE
Turn off color sampling for qpr2
A separate CL has been submitted to add an API
to enabled / disabled color sampling in master.
Bug: 143556482
Test: atest BrightnessTrackerTest
Change-Id: I4401cd35a2aa0ec35afaba928c95c971f92b0557
diff --git a/services/core/java/com/android/server/display/BrightnessTracker.java b/services/core/java/com/android/server/display/BrightnessTracker.java
index 126beef..765fdb6 100644
--- a/services/core/java/com/android/server/display/BrightnessTracker.java
+++ b/services/core/java/com/android/server/display/BrightnessTracker.java
@@ -94,6 +94,8 @@
static final String TAG = "BrightnessTracker";
static final boolean DEBUG = false;
+ @VisibleForTesting
+ static final boolean ENABLE_COLOR_SAMPLING = false;
private static final String EVENTS_FILE = "brightness_events.xml";
private static final String AMBIENT_BRIGHTNESS_STATS_FILE = "ambient_brightness_stats.xml";
@@ -757,7 +759,8 @@
}
private void enableColorSampling() {
- if (!mInjector.isBrightnessModeAutomatic(mContentResolver)
+ if (!ENABLE_COLOR_SAMPLING
+ || !mInjector.isBrightnessModeAutomatic(mContentResolver)
|| !mInjector.isInteractive(mContext)
|| mColorSamplingEnabled) {
return;
diff --git a/services/tests/servicestests/src/com/android/server/display/BrightnessTrackerTest.java b/services/tests/servicestests/src/com/android/server/display/BrightnessTrackerTest.java
index 7081d2e..75fac7c 100644
--- a/services/tests/servicestests/src/com/android/server/display/BrightnessTrackerTest.java
+++ b/services/tests/servicestests/src/com/android/server/display/BrightnessTrackerTest.java
@@ -120,7 +120,7 @@
assertTrue(mInjector.mIdleScheduled);
mInjector.sendScreenChange(/*screen on */ true);
assertNotNull(mInjector.mSensorListener);
- assertTrue(mInjector.mColorSamplingEnabled);
+ assertEquals(BrightnessTracker.ENABLE_COLOR_SAMPLING, mInjector.mColorSamplingEnabled);
mInjector.sendScreenChange(/*screen on */ false);
assertNull(mInjector.mSensorListener);
@@ -141,7 +141,7 @@
// Turn on screen while brightness mode is automatic.
mInjector.sendScreenChange(/*screen on */ true);
assertNotNull(mInjector.mSensorListener);
- assertTrue(mInjector.mColorSamplingEnabled);
+ assertEquals(BrightnessTracker.ENABLE_COLOR_SAMPLING, mInjector.mColorSamplingEnabled);
mTracker.stop();
assertNull(mInjector.mSensorListener);
@@ -184,6 +184,9 @@
@Test
public void testColorSampling_FrameRateChange() {
+ if (!BrightnessTracker.ENABLE_COLOR_SAMPLING) {
+ return;
+ }
startTracker(mTracker);
assertTrue(mInjector.mColorSamplingEnabled);
assertNotNull(mInjector.mDisplayListener);
@@ -211,8 +214,10 @@
mInjector.setBrightnessMode(/*isBrightnessModeAutomatic*/ true);
assertNotNull(mInjector.mSensorListener);
- assertTrue(mInjector.mColorSamplingEnabled);
- assertNotNull(mInjector.mDisplayListener);
+ assertEquals(BrightnessTracker.ENABLE_COLOR_SAMPLING, mInjector.mColorSamplingEnabled);
+ if (BrightnessTracker.ENABLE_COLOR_SAMPLING) {
+ assertNotNull(mInjector.mDisplayListener);
+ }
SensorEventListener listener = mInjector.mSensorListener;
DisplayManager.DisplayListener displayListener = mInjector.mDisplayListener;
@@ -226,8 +231,10 @@
assertFalse(mInjector.mColorSamplingEnabled);
assertNull(mInjector.mDisplayListener);
mInjector.mSensorListener = listener;
- mInjector.mDisplayListener = displayListener;
- mInjector.mColorSamplingEnabled = true;
+ if (BrightnessTracker.ENABLE_COLOR_SAMPLING) {
+ mInjector.mDisplayListener = displayListener;
+ mInjector.mColorSamplingEnabled = true;
+ }
mInjector.setBrightnessMode(/*isBrightnessModeAutomatic*/ false);
assertNull(mInjector.mSensorListener);
@@ -301,8 +308,11 @@
assertEquals(3333, event.colorTemperature);
assertEquals("a.package", event.packageName);
assertEquals(0, event.userId);
- assertArrayEquals(new long[] {1, 10, 100, 1000, 300, 30, 10, 1}, event.colorValueBuckets);
- assertEquals(10000, event.colorSampleDuration);
+ if (BrightnessTracker.ENABLE_COLOR_SAMPLING) {
+ assertArrayEquals(new long[]{1, 10, 100, 1000, 300, 30, 10, 1},
+ event.colorValueBuckets);
+ assertEquals(10000, event.colorSampleDuration);
+ }
assertEquals(1, eventsNoPackage.size());
assertNull(eventsNoPackage.get(0).packageName);
@@ -559,8 +569,11 @@
assertEquals(0.5f, event.powerBrightnessFactor, FLOAT_DELTA);
assertTrue(event.isUserSetBrightness);
assertFalse(event.isDefaultBrightnessConfig);
- assertArrayEquals(new long[] {1, 10, 100, 1000, 300, 30, 10, 1}, event.colorValueBuckets);
- assertEquals(10000, event.colorSampleDuration);
+ if (BrightnessTracker.ENABLE_COLOR_SAMPLING) {
+ assertArrayEquals(new long[]{1, 10, 100, 1000, 300, 30, 10, 1},
+ event.colorValueBuckets);
+ assertEquals(10000, event.colorSampleDuration);
+ }
}
@Test
