summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLakshman Annadorai <lakshmana@google.com>2024-02-09 19:13:44 +0000
committerLakshman Annadorai <lakshmana@google.com>2024-02-09 21:06:21 +0000
commite567031d44b88c43582f9bfe75bd51dadeda322e (patch)
treec3e576716fbe7755decee1fbb8bd328bb7b023f8
parent70c4c393556a7d4c47f5b9d768520a4d55254fca (diff)
downloadcar-android13-gsi.tar.gz
Unset carwatchdog health check interval in GSI image product props.android13-gsi
Test: ./vts-tradefed; run vts --module VtsAidlWatchdogTargetTest Bug: 276160141 Change-Id: Ibeff5f244cf54c81d3e6b75b8e4e1cf8dece519f
-rw-r--r--emulator/aosp_car_emulator.mk4
-rw-r--r--gsi_car_base.mk3
2 files changed, 5 insertions, 2 deletions
diff --git a/emulator/aosp_car_emulator.mk b/emulator/aosp_car_emulator.mk
index f0810a9..30f7e35 100644
--- a/emulator/aosp_car_emulator.mk
+++ b/emulator/aosp_car_emulator.mk
@@ -44,5 +44,5 @@ endif # ENABLE_CLUSTER_OS_DOUBLE
endif # BUILD_EMULATOR_CLUSTER_DISPLAY
PRODUCT_PRODUCT_PROPERTIES += \
- ro.carwatchdog.vhal_healthcheck.interval=10 \
- ro.carwatchdog.client_healthcheck.interval=20 \
+ ro.carwatchdog.vhal_healthcheck.interval?=10 \
+ ro.carwatchdog.client_healthcheck.interval?=20
diff --git a/gsi_car_base.mk b/gsi_car_base.mk
index 3fdfa77..daea336 100644
--- a/gsi_car_base.mk
+++ b/gsi_car_base.mk
@@ -168,5 +168,8 @@ PRODUCT_PACKAGE_OVERLAYS := device/generic/car/common/overlay
EMULATOR_VENDOR_NO_SENSORS := true
PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
DO_NOT_INCLUDE_BT_SEPOLICY := true
+PRODUCT_PRODUCT_PROPERTIES += \
+ ro.carwatchdog.vhal_healthcheck.interval="" \
+ ro.carwatchdog.client_healthcheck.interval=""
$(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk)
EMULATOR_VENDOR_NO_SOUND := true