Ignore dwb bias if lux = -1

If ambient lux is -1, ignore the brightness to bias spline, since this
is not a valid value that should be considered.

Bug: 258765080
Test: atest com.android.server.display
Change-Id: Ib2a44ad5fe0490e9e322738de4e63c423b6b0036
This commit is contained in:
Fiona Campbell
2023-01-27 12:51:45 +00:00
parent 04e08686b6
commit d0bfa7d462

View File

@@ -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