Merge "Disable WCG on Pixel 2017." into qt-dev am: ec4f0d31b7

am: 28f8c81a72

Change-Id: I9d4e0fa7b6f0643a7f0c72947714d20a2d24bc3d
This commit is contained in:
Peiyong Lin
2019-06-19 16:43:18 -07:00
committed by android-build-merger
2 changed files with 1 additions and 5 deletions

View File

@@ -148,7 +148,7 @@ VSYNC_EVENT_PHASE_OFFSET_NS := 2000000
SF_VSYNC_EVENT_PHASE_OFFSET_NS := 6000000
# Display
TARGET_HAS_WIDE_COLOR_DISPLAY := true
TARGET_HAS_WIDE_COLOR_DISPLAY := false
TARGET_HAS_HDR_DISPLAY := false
TARGET_USES_COLOR_METADATA := true

View File

@@ -698,10 +698,6 @@ PRODUCT_PACKAGES += \
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_color_management=true
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.protected_contents=true
# Must align with HAL types Dataspace
# The data space of wide color gamut composition preference is Dataspace::DISPLAY_P3
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.wcg_composition_dataspace=143261696
# Early phase offset configuration for SurfaceFlinger
PRODUCT_PROPERTY_OVERRIDES += \
debug.sf.early_phase_offset_ns=1500000