commit afc115199a37c99c9707e304f0c147a05a3e45f2
author Kai Wang <kwangsudo@google.com> Mon May 17 18:16:07 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 17 18:16:07 2021 +0000
tree 7a096bb2359bf7e5e79d4d552a3f153f92d461ec
parent 561d79e024996695bc64221868477bd93b8ea573
parent 3be21ccf01766b9f05b4078dd510defe6736d6ec

Merge "Rename Unix_time property to EPOCH_TIME" into sc-dev

automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h

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 81f3198..ed99942 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 @@
         {
                 .config =
                         {
-                                .prop = toInt(VehicleProperty::UNIX_TIME),
+                                .prop = toInt(VehicleProperty::EPOCH_TIME),
                                 .access = VehiclePropertyAccess::READ_WRITE,
                                 .changeMode = VehiclePropertyChangeMode::ON_CHANGE,
                         },

automotive/vehicle/2.0/types.hal

diff --git a/automotive/vehicle/2.0/types.hal b/automotive/vehicle/2.0/types.hal
index e22f9fa..6bfda32 100644
--- a/automotive/vehicle/2.0/types.hal
+++ b/automotive/vehicle/2.0/types.hal
@@ -1446,7 +1446,7 @@
      * @access VehiclePropertyAccess:READ_WRITE
      * @unit VehicleUnit:MILLI_SECS
      */
-    UNIX_TIME = (
+    EPOCH_TIME = (
         0x0606
         | VehiclePropertyGroup:SYSTEM
         | VehiclePropertyType:INT64