Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fiona Campbell
2023-02-01 10:57:43 +00:00
committed by Android (Google) Code Review
parent e02788c4c8 d0bfa7d462
commit fb0cfb233f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceController.java
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