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

Commit 536bd4ab authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Stop the screen off brightness sensor controller" into tm-qpr-dev am:... 

Merge "Stop the screen off brightness sensor controller" into tm-qpr-dev am: 3fce317e am: 52d2e66e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20869684



Change-Id: If835aac79a700dd0f909f72d9476ab6a5b639a7a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c7341bb7 52d2e66e

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

+7 −0
Original line number Diff line number Diff line
@@ -852,6 +852,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                mAutomaticBrightnessController.stop();

            }



            if (mScreenOffBrightnessSensorController != null) {

                mScreenOffBrightnessSensorController.stop();

            }



            if (mBrightnessSetting != null) {

                mBrightnessSetting.unregisterListener(mBrightnessSettingListener);

            }
@@ -1093,6 +1097,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
            mBrightnessEventRingBuffer =

                    new RingBuffer<>(BrightnessEvent.class, RINGBUFFER_MAX);



            if (mScreenOffBrightnessSensorController != null) {

                mScreenOffBrightnessSensorController.stop();

            }

            loadScreenOffBrightnessSensor();

            int[] sensorValueToLux = mDisplayDeviceConfig.getScreenOffBrightnessSensorValueToLux();

            if (mScreenOffBrightnessSensor != null && sensorValueToLux != null) {

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

+4 −0
Original line number Diff line number Diff line
@@ -92,6 +92,10 @@ public class ScreenOffBrightnessSensorController implements SensorEventListener 
        }

    }



    void stop() {

        setLightSensorEnabled(false);

    }



    float getAutomaticScreenBrightness() {

        if (mLastSensorValue < 0 || mLastSensorValue >= mSensorValueToLux.length

                || (!mRegistered

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

+10 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import androidx.test.runner.AndroidJUnit4; 


import com.android.server.testutils.OffsettableClock;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -73,6 +74,15 @@ public class ScreenOffBrightnessSensorControllerTest { 
        );

    }



    @After

    public void tearDown() {

        if (mController != null) {

            // Stop the update Brightness loop.

            mController.stop();

            mController = null;

        }

    }



    @Test

    public void testBrightness() throws Exception {

        when(mSensorManager.registerListener(any(SensorEventListener.class), eq(mLightSensor),