Merge "Merge "Fix Walleye dim brightness curves" into rvc-dev am: 0f8da63140... (7ee2b0cf) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/display/BrightnessMappingStrategy.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -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(