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

Merge "RESTRICT AUTOMERGE Turn off color sampling for qpr2" into qt-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-11-28 15:53:23 +00:00
committed by Android (Google) Code Review
parent 4e50d9b0f3 a845a40472
commit 0ae87ec494
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/display/BrightnessTracker.java
View File

@@ -94,6 +94,8 @@ public class BrightnessTracker {
static final String TAG = "BrightnessTracker"; static final String TAG = "BrightnessTracker";
static final boolean DEBUG = false; 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 EVENTS_FILE = "brightness_events.xml";
private static final String AMBIENT_BRIGHTNESS_STATS_FILE = "ambient_brightness_stats.xml"; private static final String AMBIENT_BRIGHTNESS_STATS_FILE = "ambient_brightness_stats.xml";
@@ -757,7 +759,8 @@ public class BrightnessTracker {
} }
private void enableColorSampling() { private void enableColorSampling() {
if (!mInjector.isBrightnessModeAutomatic(mContentResolver) if (!ENABLE_COLOR_SAMPLING
|| !mInjector.isBrightnessModeAutomatic(mContentResolver)
|| !mInjector.isInteractive(mContext) || !mInjector.isInteractive(mContext)
|| mColorSamplingEnabled) { || mColorSamplingEnabled) {
return; return;

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

@@ -120,7 +120,7 @@ public class BrightnessTrackerTest {
assertTrue(mInjector.mIdleScheduled); assertTrue(mInjector.mIdleScheduled);
mInjector.sendScreenChange(/*screen on */ true); mInjector.sendScreenChange(/*screen on */ true);
assertNotNull(mInjector.mSensorListener); assertNotNull(mInjector.mSensorListener);
assertTrue(mInjector.mColorSamplingEnabled); assertEquals(BrightnessTracker.ENABLE_COLOR_SAMPLING, mInjector.mColorSamplingEnabled);
mInjector.sendScreenChange(/*screen on */ false); mInjector.sendScreenChange(/*screen on */ false);
assertNull(mInjector.mSensorListener); assertNull(mInjector.mSensorListener);
@@ -141,7 +141,7 @@ public class BrightnessTrackerTest {
// Turn on screen while brightness mode is automatic. // Turn on screen while brightness mode is automatic.
mInjector.sendScreenChange(/*screen on */ true); mInjector.sendScreenChange(/*screen on */ true);
assertNotNull(mInjector.mSensorListener); assertNotNull(mInjector.mSensorListener);
assertTrue(mInjector.mColorSamplingEnabled); assertEquals(BrightnessTracker.ENABLE_COLOR_SAMPLING, mInjector.mColorSamplingEnabled);
mTracker.stop(); mTracker.stop();
assertNull(mInjector.mSensorListener); assertNull(mInjector.mSensorListener);
@@ -184,6 +184,9 @@ public class BrightnessTrackerTest {
@Test @Test
public void testColorSampling_FrameRateChange() { public void testColorSampling_FrameRateChange() {
if (!BrightnessTracker.ENABLE_COLOR_SAMPLING) {
return;
}
startTracker(mTracker); startTracker(mTracker);
assertTrue(mInjector.mColorSamplingEnabled); assertTrue(mInjector.mColorSamplingEnabled);
assertNotNull(mInjector.mDisplayListener); assertNotNull(mInjector.mDisplayListener);
@@ -211,8 +214,10 @@ public class BrightnessTrackerTest {
mInjector.setBrightnessMode(/*isBrightnessModeAutomatic*/ true); mInjector.setBrightnessMode(/*isBrightnessModeAutomatic*/ true);
assertNotNull(mInjector.mSensorListener); assertNotNull(mInjector.mSensorListener);
assertTrue(mInjector.mColorSamplingEnabled); assertEquals(BrightnessTracker.ENABLE_COLOR_SAMPLING, mInjector.mColorSamplingEnabled);
if (BrightnessTracker.ENABLE_COLOR_SAMPLING) {
assertNotNull(mInjector.mDisplayListener); assertNotNull(mInjector.mDisplayListener);
}
SensorEventListener listener = mInjector.mSensorListener; SensorEventListener listener = mInjector.mSensorListener;
DisplayManager.DisplayListener displayListener = mInjector.mDisplayListener; DisplayManager.DisplayListener displayListener = mInjector.mDisplayListener;
@@ -226,8 +231,10 @@ public class BrightnessTrackerTest {
assertFalse(mInjector.mColorSamplingEnabled); assertFalse(mInjector.mColorSamplingEnabled);
assertNull(mInjector.mDisplayListener); assertNull(mInjector.mDisplayListener);
mInjector.mSensorListener = listener; mInjector.mSensorListener = listener;
if (BrightnessTracker.ENABLE_COLOR_SAMPLING) {
mInjector.mDisplayListener = displayListener; mInjector.mDisplayListener = displayListener;
mInjector.mColorSamplingEnabled = true; mInjector.mColorSamplingEnabled = true;
}
mInjector.setBrightnessMode(/*isBrightnessModeAutomatic*/ false); mInjector.setBrightnessMode(/*isBrightnessModeAutomatic*/ false);
assertNull(mInjector.mSensorListener); assertNull(mInjector.mSensorListener);
@@ -301,8 +308,11 @@ public class BrightnessTrackerTest {
assertEquals(3333, event.colorTemperature); assertEquals(3333, event.colorTemperature);
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); if (BrightnessTracker.ENABLE_COLOR_SAMPLING) {
assertArrayEquals(new long[]{1, 10, 100, 1000, 300, 30, 10, 1},
event.colorValueBuckets);
assertEquals(10000, event.colorSampleDuration); assertEquals(10000, event.colorSampleDuration);
}
assertEquals(1, eventsNoPackage.size()); assertEquals(1, eventsNoPackage.size());
assertNull(eventsNoPackage.get(0).packageName); assertNull(eventsNoPackage.get(0).packageName);
@@ -559,9 +569,12 @@ public class BrightnessTrackerTest {
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);
assertArrayEquals(new long[] {1, 10, 100, 1000, 300, 30, 10, 1}, event.colorValueBuckets); if (BrightnessTracker.ENABLE_COLOR_SAMPLING) {
assertArrayEquals(new long[]{1, 10, 100, 1000, 300, 30, 10, 1},
event.colorValueBuckets);
assertEquals(10000, event.colorSampleDuration); assertEquals(10000, event.colorSampleDuration);
} }
}
@Test @Test
public void testWritePrunesOldEvents() throws Exception { public void testWritePrunesOldEvents() throws Exception {