Merge "Fix Walleye dim brightness curves" into rvc-dev

This commit is contained in:
Fiona Campbell
2020-05-27 16:25:51 +00:00
committed by Android (Google) Code Review

View File

@@ -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;
@@ -347,10 +346,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<float[], float[]> insertControlPoint(