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

Commit 549611e8 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge remote-tracking branch 'origin/lineage-18.1' into v1-r

parents 59d2d6ff 0f312543

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

+1 −2
Original line number Diff line number Diff line
@@ -325,7 +325,6 @@ class AutomaticBrightnessController { 
        boolean dozing = (displayPolicy == DisplayPowerRequest.POLICY_DOZE);

        boolean changed = setBrightnessConfiguration(configuration);

        changed |= setDisplayPolicy(displayPolicy);



        if (userChangedAutoBrightnessAdjustment) {

            changed |= setAutoBrightnessAdjustment(adjustment);

        }

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

+1 −2
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
    // PowerManager.BRIGHTNESS_INVALID_FLOAT when there's no temporary adjustment set.

    private float mTemporaryAutoBrightnessAdjustment;



    // Wether auto brightness is applied one shot when screen is turned on

    // Whether auto brightness is applied one shot when screen is turned on

    private boolean mAutoBrightnessOneShot;



    // Animators.
@@ -967,7 +967,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
            brightnessAdjustmentFlags = BrightnessReason.ADJUSTMENT_AUTO;

            mAppliedTemporaryAutoBrightnessAdjustment = false;

        }



        // Apply brightness boost.

        // We do this here after deciding whether auto-brightness is enabled so that we don't

        // disable the light sensor during this temporary state.  That way when boost ends we will