Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Christine Franks
2019-05-20 04:51:18 +00:00
committed by Android (Google) Code Review
parent e3710a3624 531c0612a6
commit abc726ec50
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/display/color/ColorDisplayService.java
View File

@@ -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_BOOSTED;
import static android.hardware.display.ColorDisplayManager.COLOR_MODE_NATURAL; import static android.hardware.display.ColorDisplayManager.COLOR_MODE_NATURAL;
import static android.hardware.display.ColorDisplayManager.COLOR_MODE_SATURATED; 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; 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; return COLOR_MODE_SATURATED;
} else if (displayColorSetting == 2) { } else if (displayColorSetting == 2) {
return COLOR_MODE_AUTOMATIC; return COLOR_MODE_AUTOMATIC;
} else if (displayColorSetting >= VENDOR_COLOR_MODE_RANGE_MIN
&& displayColorSetting <= VENDOR_COLOR_MODE_RANGE_MAX) {
return displayColorSetting;
} else { } else {
return -1; return -1;
} }