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

Commit 246d553f authored by Chris Kuiper's avatar Chris Kuiper
Browse files

DisplayManager: Make sure RampAnimator sets property in linear space. 

This fixes the case where RampAnimator is used the first time and
immediately jumps to the target brightness. In that case the property
was set to a value that has not been converted back into linear
space, causing an incorrect initial brightness value.

To avoid these bugs, consolidate setting of the property into one
function.

Bug: 217289549
Test: Cannot reproduce bug.
Change-Id: I2ccdaa51ddba062fc5de1209470b90eb429280db
parent f7e29a40

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

+11 −4
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ class RampAnimator<T> { 
                mRate = 0;

                mTargetValue = target;

                mCurrentValue = target;

                mProperty.setValue(mObject, target);

                setPropertyValue(target);

                if (mAnimating) {

                    mAnimating = false;

                    cancelAnimationCallback();
@@ -125,6 +125,15 @@ class RampAnimator<T> { 
        mListener = listener;

    }



    /**

     * Sets the brightness property by converting the given value from HLG space

     * into linear space.

     */

    private void setPropertyValue(float val) {

        final float linearVal = BrightnessUtils.convertGammaToLinear(val);

        mProperty.setValue(mObject, linearVal);

    }



    private void postAnimationCallback() {

        mChoreographer.postCallback(Choreographer.CALLBACK_ANIMATION, mAnimationCallback, null);

    }
@@ -160,9 +169,7 @@ class RampAnimator<T> { 
            final float oldCurrentValue = mCurrentValue;

            mCurrentValue = mAnimatedValue;

            if (oldCurrentValue != mCurrentValue) {

                // Convert value from HLG into linear space for the property.

                final float linearCurrentVal = BrightnessUtils.convertGammaToLinear(mCurrentValue);

                mProperty.setValue(mObject, linearCurrentVal);

                setPropertyValue(mCurrentValue);

            }

            if (mTargetValue != mCurrentValue) {

                postAnimationCallback();