From 33e6d6faffeed24d4f8b195766d7b6144b10e4bc Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Tue, 5 Dec 2023 05:36:32 +0000 Subject: [PATCH] display: disable VRR for factory builds Bug: 314255124 Test: VRR is enalbed in formal builds but disabled in factory Change-Id: I2bc142c75f69383ffa06291b21d0aaa5916e3df5 --- device-caiman.mk | 8 +++++--- device-komodo.mk | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index ee35cf43..22f64a5c 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -224,9 +224,11 @@ PRODUCT_VENDOR_PROPERTIES += \ # Display RRS default Config PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.vendor.display.primary.boot_config=960x2142@120:120 -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.enabled=true -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.headsup_ns=30000000 -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.timeout_ns=500000000 +ifeq ($(filter factory_caiman, $(TARGET_PRODUCT)),) + PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.enabled=true + PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.headsup_ns=30000000 + PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.timeout_ns=500000000 +endif # Display OP HZ Config PRODUCT_VENDOR_PROPERTIES += \ diff --git a/device-komodo.mk b/device-komodo.mk index 27b58c7f..079a1a53 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -49,9 +49,11 @@ $(call soong_config_set,google3a_config,target_device,komodo) # Display RRS default Config PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.vendor.display.primary.boot_config=1008x2244@120:120 -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.enabled=true -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.headsup_ns=30000000 -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.timeout_ns=500000000 +ifeq ($(filter factory_komodo, $(TARGET_PRODUCT)),) + PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.enabled=true + PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.headsup_ns=30000000 + PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.timeout_ns=500000000 +endif PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layers=true