From 3be21ccf01766b9f05b4078dd510defe6736d6ec Mon Sep 17 00:00:00 2001 From: Kai Wang Date: Fri, 14 May 2021 23:44:10 +0000 Subject: [PATCH] Rename Unix_time property to EPOCH_TIME Bug: 188227292 Test: build and flash with google VHAL check property from KitchenSink Change-Id: I7dc1833a000949f246a1a8be6f87970a1478832b --- automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h | 2 +- automotive/vehicle/2.0/types.hal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h index abf33a3f46..e234aa9fdd 100644 --- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h +++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h @@ -1201,7 +1201,7 @@ const ConfigDeclaration kVehicleProperties[]{ { .config = { - .prop = toInt(VehicleProperty::UNIX_TIME), + .prop = toInt(VehicleProperty::EPOCH_TIME), .access = VehiclePropertyAccess::READ_WRITE, .changeMode = VehiclePropertyChangeMode::ON_CHANGE, }, diff --git a/automotive/vehicle/2.0/types.hal b/automotive/vehicle/2.0/types.hal index e22f9fa5bd..6bfda32983 100644 --- a/automotive/vehicle/2.0/types.hal +++ b/automotive/vehicle/2.0/types.hal @@ -1446,7 +1446,7 @@ enum VehicleProperty : int32_t { * @access VehiclePropertyAccess:READ_WRITE * @unit VehicleUnit:MILLI_SECS */ - UNIX_TIME = ( + EPOCH_TIME = ( 0x0606 | VehiclePropertyGroup:SYSTEM | VehiclePropertyType:INT64