Support vendor color modes for sf mode sysprop

Bug: 128607042
Test: n/a
Change-Id: I9e1e94911bcc04c6f82ce398da8df9ae85d8b88a

1 files changed, 5 insertions, 0 deletions

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 ad81ca2ec2b1..b2420b5b320e 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;
         }