summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeiyong Lin <lpy@google.com>2019-06-19 16:00:38 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-19 16:00:38 -0700
commit1d38c0eac534e0c56ed019e8ab72050b7694210d (patch)
tree3c1a676229d70010b27d4d0ec48dbb226b7beb9a
parentf52225f443521243c55eb28064c880de1351114a (diff)
parentec4f0d31b7d98845209f075c1aa367450494ef7f (diff)
downloaddevice_google_wahoo-1d38c0eac534e0c56ed019e8ab72050b7694210d.tar.gz
device_google_wahoo-1d38c0eac534e0c56ed019e8ab72050b7694210d.tar.bz2
device_google_wahoo-1d38c0eac534e0c56ed019e8ab72050b7694210d.zip
Merge "Disable WCG on Pixel 2017." into qt-dev
am: ec4f0d31b7 Change-Id: I3aef946f657dce5432a4aea99c815cc315340a26
-rw-r--r--BoardConfig.mk2
-rwxr-xr-xdevice.mk4
2 files changed, 1 insertions, 5 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 3b6dc3f5..5687abae 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -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
diff --git a/device.mk b/device.mk
index 042fc6e5..49490098 100755
--- a/device.mk
+++ b/device.mk
@@ -711,10 +711,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