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

Commit 77da4615 authored by Philip Junker's avatar Philip Junker Committed by Android (Google) Code Review
Browse files

Merge "Mark mAutomaticBrightnessController @Nullable."

parents 22b158d0 4d9cb42e

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

+5 −2
Original line number Diff line number Diff line
@@ -378,6 +378,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
    private float mInitialAutoBrightness;



    // The controller for the automatic brightness level.

    @Nullable

    private AutomaticBrightnessController mAutomaticBrightnessController;



    private Sensor mLightSensor;
@@ -608,7 +609,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        mPendingRbcOnOrChanged = strengthChanged || justActivated;



        // Reset model if strength changed OR rbc is turned off

        if (strengthChanged || !justActivated && mAutomaticBrightnessController != null) {

        if ((strengthChanged || !justActivated) && mAutomaticBrightnessController != null) {

            mAutomaticBrightnessController.resetShortTermModel();

        }

    }
@@ -1567,7 +1568,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                    sendUpdatePowerStateLocked();

                    mHandler.post(mOnBrightnessChangeRunnable);

                    // TODO(b/192258832): Switch the HBMChangeCallback to a listener pattern.

                    if (mAutomaticBrightnessController != null) {

                        mAutomaticBrightnessController.update();

                    }

                }, mContext);

    }