From 270ea4155a23418215cb06056ff5918ba3a66966 Mon Sep 17 00:00:00 2001 From: Fiona Campbell Date: Tue, 12 May 2020 19:55:03 +0100 Subject: [PATCH] Fix Walleye dim brightness curves This fixes the issue that cause -1.0f to be added to the brightness curves when a devices had 0 in the backlight configuration (config_screenBrightnessBacklight) in config.xml. This code is the same as it originally was before the float brightness changes. Bug: 153290107 Test: manual, check values in `adb shell dumpsys display | grep -i "spline\|mconfig\|mambientlux"` Change-Id: I332fc09565b26bfc5f108fe32bf109f9584c60a2 --- .../android/server/display/BrightnessMappingStrategy.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/display/BrightnessMappingStrategy.java b/services/core/java/com/android/server/display/BrightnessMappingStrategy.java index a099606852d0e..9fce34ac5c1f0 100644 --- a/services/core/java/com/android/server/display/BrightnessMappingStrategy.java +++ b/services/core/java/com/android/server/display/BrightnessMappingStrategy.java @@ -28,7 +28,6 @@ import android.util.Pair; import android.util.Slog; import android.util.Spline; -import com.android.internal.BrightnessSynchronizer; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.Preconditions; import com.android.server.display.utils.Plog; @@ -342,10 +341,11 @@ public abstract class BrightnessMappingStrategy { } } + // Normalize entire brightness range to 0 - 1. protected static float normalizeAbsoluteBrightness(int brightness) { - return BrightnessSynchronizer.brightnessIntToFloat(brightness, - PowerManager.BRIGHTNESS_OFF + 1, PowerManager.BRIGHTNESS_ON, - PowerManager.BRIGHTNESS_MIN, PowerManager.BRIGHTNESS_MAX); + brightness = MathUtils.constrain(brightness, + PowerManager.BRIGHTNESS_OFF, PowerManager.BRIGHTNESS_ON); + return (float) brightness / PowerManager.BRIGHTNESS_ON; } private Pair insertControlPoint(