Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ae87ec4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 4e50d9b0 a845a404

services/core/java/com/android/server/display/BrightnessTracker.java

+4 −1
Original line number Diff line number Diff line
@@ -94,6 +94,8 @@ public class BrightnessTracker { 


    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 @@ public class BrightnessTracker { 
    }



    private void enableColorSampling() {

        if (!mInjector.isBrightnessModeAutomatic(mContentResolver)

        if (!ENABLE_COLOR_SAMPLING

                || !mInjector.isBrightnessModeAutomatic(mContentResolver)

                || !mInjector.isInteractive(mContext)

                || mColorSamplingEnabled) {

            return;

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

+23 −10
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ public class BrightnessTrackerTest { 
        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 @@ public class BrightnessTrackerTest { 
        // 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 @@ public class BrightnessTrackerTest { 


    @Test

    public void testColorSampling_FrameRateChange() {

        if (!BrightnessTracker.ENABLE_COLOR_SAMPLING) {

            return;

        }

        startTracker(mTracker);

        assertTrue(mInjector.mColorSamplingEnabled);

        assertNotNull(mInjector.mDisplayListener);
@@ -211,8 +214,10 @@ public class BrightnessTrackerTest { 


        mInjector.setBrightnessMode(/*isBrightnessModeAutomatic*/ true);

        assertNotNull(mInjector.mSensorListener);

        assertTrue(mInjector.mColorSamplingEnabled);

        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 @@ public class BrightnessTrackerTest { 
        assertFalse(mInjector.mColorSamplingEnabled);

        assertNull(mInjector.mDisplayListener);

        mInjector.mSensorListener = listener;

        if (BrightnessTracker.ENABLE_COLOR_SAMPLING) {

            mInjector.mDisplayListener = displayListener;

            mInjector.mColorSamplingEnabled = true;

        }



        mInjector.setBrightnessMode(/*isBrightnessModeAutomatic*/ false);

        assertNull(mInjector.mSensorListener);
@@ -301,8 +308,11 @@ public class BrightnessTrackerTest { 
        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);

        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,9 +569,12 @@ public class BrightnessTrackerTest { 
        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);

        if (BrightnessTracker.ENABLE_COLOR_SAMPLING) {

            assertArrayEquals(new long[]{1, 10, 100, 1000, 300, 30, 10, 1},

                    event.colorValueBuckets);

            assertEquals(10000, event.colorSampleDuration);

        }

    }



    @Test

    public void testWritePrunesOldEvents() throws Exception {