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

Commit 281aa083 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Refactor stopping the screen off brightness sensor controller" into... 

Merge "Refactor stopping the screen off brightness sensor controller" into tm-qpr-dev am: 12dbc309

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



Change-Id: I8c63ea533782b2230043d3a6741310c79e9e5689
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents afdb8b14 12dbc309

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() {