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

This commit is contained in:
Kai Wang 2021-05-17 18:16:07 +00:00 committed by Android (Google) Code Review
commit afc115199a
2 changed files with 2 additions and 2 deletions

View file

@ -1201,7 +1201,7 @@ const ConfigDeclaration kVehicleProperties[]{
{ {
.config = .config =
{ {
.prop = toInt(VehicleProperty::UNIX_TIME), .prop = toInt(VehicleProperty::EPOCH_TIME),
.access = VehiclePropertyAccess::READ_WRITE, .access = VehiclePropertyAccess::READ_WRITE,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE, .changeMode = VehiclePropertyChangeMode::ON_CHANGE,
}, },

View file

@ -1446,7 +1446,7 @@ enum VehicleProperty : int32_t {
* @access VehiclePropertyAccess:READ_WRITE * @access VehiclePropertyAccess:READ_WRITE
* @unit VehicleUnit:MILLI_SECS * @unit VehicleUnit:MILLI_SECS
*/ */
UNIX_TIME = ( EPOCH_TIME = (
0x0606 0x0606
| VehiclePropertyGroup:SYSTEM | VehiclePropertyGroup:SYSTEM
| VehiclePropertyType:INT64 | VehiclePropertyType:INT64