| commit | 461dd8c42ec717f09054d7fcf6b121b3e67efeec | [log] [tgz] |
|---|---|---|
| author | Kai Wang <kwangsudo@google.com> | Mon May 17 18:37:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 17 18:37:55 2021 +0000 |
| tree | d5752af36399d3dc18e3a42997bb287deea4fa0d | |
| parent | ec52ecc0a70b00393928d0e23b98f5c6600ade74 [diff] | |
| parent | afc115199a37c99c9707e304f0c147a05a3e45f2 [diff] |
Merge "Rename Unix_time property to EPOCH_TIME" into sc-dev am: afc115199a Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14555283 Change-Id: Ide6f4b47165d04d6619d8c54ddde105f3580e52c
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, },
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