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

Commit fb0cfb23 authored by Fiona Campbell's avatar Fiona Campbell Committed by Android (Google) Code Review
Browse files

Merge "Ignore dwb bias if lux = -1" into tm-qpr-dev

parents e02788c4 d0bfa7d4

services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceController.java

+4 −4
Original line number Diff line number Diff line
@@ -419,16 +419,16 @@ public class DisplayWhiteBalanceController implements 
        float ambientBrightness = mBrightnessFilter.getEstimate(time);

        mLatestAmbientBrightness = ambientBrightness;



        if (ambientColorTemperature != -1.0f &&

                mLowLightAmbientBrightnessToBiasSpline != null) {

        if (ambientColorTemperature != -1.0f && ambientBrightness != -1.0f

                && mLowLightAmbientBrightnessToBiasSpline != null) {

            float bias = mLowLightAmbientBrightnessToBiasSpline.interpolate(ambientBrightness);

            ambientColorTemperature =

                    bias * ambientColorTemperature + (1.0f - bias)

                    * mLowLightAmbientColorTemperature;

            mLatestLowLightBias = bias;

        }

        if (ambientColorTemperature != -1.0f &&

                mHighLightAmbientBrightnessToBiasSpline != null) {

        if (ambientColorTemperature != -1.0f && ambientBrightness != -1.0f

                && mHighLightAmbientBrightnessToBiasSpline != null) {

            float bias = mHighLightAmbientBrightnessToBiasSpline.interpolate(ambientBrightness);

            ambientColorTemperature =

                    (1.0f - bias) * ambientColorTemperature + bias