From 531c0612a6543ea61e331f3b22e1dd127ca2e65a Mon Sep 17 00:00:00 2001 From: Christine Franks Date: Thu, 16 May 2019 14:29:14 -0700 Subject: [PATCH] Support vendor color modes for sf mode sysprop Bug: 128607042 Test: n/a Change-Id: I9e1e94911bcc04c6f82ce398da8df9ae85d8b88a --- .../android/server/display/color/ColorDisplayService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/services/core/java/com/android/server/display/color/ColorDisplayService.java b/services/core/java/com/android/server/display/color/ColorDisplayService.java index ad81ca2ec2b1b..b2420b5b320ea 100644 --- a/services/core/java/com/android/server/display/color/ColorDisplayService.java +++ b/services/core/java/com/android/server/display/color/ColorDisplayService.java @@ -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; }