diff --git a/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceController.java b/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceController.java index 85d5b4f0a1faa..5b772fc917c5f 100644 --- a/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceController.java +++ b/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceController.java @@ -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