Merge "Merge "Support vendor color modes for sf mode sysprop" into qt-dev am:... (711cdfda) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/display/color/ColorDisplayService.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,8 @@ import static android.hardware.display.ColorDisplayManager.COLOR_MODE_AUTOMATIC;
		import static android.hardware.display.ColorDisplayManager.COLOR_MODE_BOOSTED;
		import static android.hardware.display.ColorDisplayManager.COLOR_MODE_NATURAL;
		import static android.hardware.display.ColorDisplayManager.COLOR_MODE_SATURATED;
		import static android.hardware.display.ColorDisplayManager.VENDOR_COLOR_MODE_RANGE_MAX;
		import static android.hardware.display.ColorDisplayManager.VENDOR_COLOR_MODE_RANGE_MIN;

		import static com.android.server.display.color.DisplayTransformManager.LEVEL_COLOR_MATRIX_NIGHT_DISPLAY;

		@@ -822,6 +824,9 @@ public final class ColorDisplayService extends SystemService {
		return COLOR_MODE_SATURATED;
		} else if (displayColorSetting == 2) {
		return COLOR_MODE_AUTOMATIC;
		} else if (displayColorSetting >= VENDOR_COLOR_MODE_RANGE_MIN
		&& displayColorSetting <= VENDOR_COLOR_MODE_RANGE_MAX) {
		return displayColorSetting;
		} else {
		return -1;
		}