Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a29e8869 authored by Christine Franks's avatar Christine Franks Committed by android-build-merger
Browse files

Merge "Merge "Support vendor color modes for sf mode sysprop" into qt-dev am:... 

Merge "Merge "Support vendor color modes for sf mode sysprop" into qt-dev am: abc726ec am: aa1e335f" into qt-r1-dev-plus-aosp
am: 711cdfda

Change-Id: Idc47d3b7965828b42b831d5a82888bd33e9f173c
parents d13d3cc6 711cdfda

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;

        }