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

Commit aa785684 authored by Daniel Solomon's avatar Daniel Solomon Committed by android-build-merger
Browse files

Merge "Fix Display White Balance color temperature on enable" into qt-dev 

am: 7cb07c1f

Change-Id: I4b606409b70ead23500d19e9c1cc0582c8be039b
parents a5736bd1 7cb07c1f

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

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ public class DisplayWhiteBalanceController implements 
        final long time = System.currentTimeMillis();

        float ambientColorTemperature = mColorTemperatureFilter.getEstimate(time);



        if (mAmbientToDisplayColorTemperatureSpline != null) {

        if (mAmbientToDisplayColorTemperatureSpline != null && ambientColorTemperature != -1.0f) {

            ambientColorTemperature =

                mAmbientToDisplayColorTemperatureSpline.interpolate(ambientColorTemperature);

        }