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

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

Merge "Refactor stopping the screen off brightness sensor controller" into tm-qpr-dev

parents dec282b8 726af2dd

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

+5 −4
Original line number Diff line number Diff line
@@ -873,10 +873,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                mAutomaticBrightnessController.stop();

            }



            if (mScreenOffBrightnessSensorController != null) {

                mScreenOffBrightnessSensorController.stop();

            }



            if (mBrightnessSetting != null) {

                mBrightnessSetting.unregisterListener(mBrightnessSettingListener);

            }
@@ -1125,6 +1121,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 


            if (mScreenOffBrightnessSensorController != null) {

                mScreenOffBrightnessSensorController.stop();

                mScreenOffBrightnessSensorController = null;

            }

            loadScreenOffBrightnessSensor();

            int[] sensorValueToLux = mDisplayDeviceConfig.getScreenOffBrightnessSensorValueToLux();
@@ -1242,6 +1239,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
            mPowerState.stop();

            mPowerState = null;

        }



        if (mScreenOffBrightnessSensorController != null) {

            mScreenOffBrightnessSensorController.stop();

        }

    }



    private void updatePowerState() {