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

Commit c0c36aa8 authored by Fiona Campbell's avatar Fiona Campbell Committed by Automerger Merge Worker
Browse files

Merge "Fix slider being at 0 on unlock" into sc-dev am: 10a6b054 

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

Change-Id: I980bf83f8fb87eeebb0190070cb62f3cf1e65a7d
parents 5e4d92e8 10a6b054

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

+7 −1
Original line number Diff line number Diff line
@@ -941,6 +941,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        final boolean mustNotify;

        final int previousPolicy;

        boolean mustInitialize = false;

        boolean shouldSaveBrightnessInfo = true;

        int brightnessAdjustmentFlags = 0;

        mBrightnessReasonTemp.set(null);

        synchronized (mLock) {
@@ -1071,6 +1072,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        if (state == Display.STATE_OFF) {

            brightnessState = PowerManager.BRIGHTNESS_OFF_FLOAT;

            mBrightnessReasonTemp.setReason(BrightnessReason.REASON_SCREEN_OFF);

            shouldSaveBrightnessInfo = false;

        }



        // Always use the VR brightness when in the VR state.
@@ -1197,6 +1199,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                && Display.isDozeState(state)) {

            brightnessState = mScreenBrightnessDozeConfig;

            mBrightnessReasonTemp.setReason(BrightnessReason.REASON_DOZE_DEFAULT);

            shouldSaveBrightnessInfo = false;

        }



        // Apply manual brightness.
@@ -1213,8 +1216,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 


        // Save out the brightness info now that the brightness state for this iteration has been

        // finalized and before we send out notifications about the brightness changing.

        if (shouldSaveBrightnessInfo) {

            saveBrightnessInfo(brightnessState);



        }



        if (updateScreenBrightnessSetting) {

            // Tell the rest of the system about the new brightness in case we had to change it

            // for things like auto-brightness or high-brightness-mode. Note that we do this