commit | e5a22f2fa1ae87c07a35a45db4f7a14292d87a63 | [log] [tgz] |
---|---|---|
author | Kai Wang <kwangsudo@google.com> | Wed Mar 18 17:47:04 2020 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Mar 18 17:47:04 2020 +0000 |
tree | 4dbc226886c0d2c1ce0ddd10e019ef853d1b1ece | |
parent | 6668eab9dc850e53fecd6fe3d93d44b53fbd0fa3 [diff] | |
parent | 47a9378d4decf802a1715653f1aef8b8a97d5aa5 [diff] |
Merge "Add timestamp for continuously property." into rvc-dev
diff --git a/automotive/vehicle/2.0/default/common/src/VehiclePropertyStore.cpp b/automotive/vehicle/2.0/default/common/src/VehiclePropertyStore.cpp index 24b777c..6087bfa 100644 --- a/automotive/vehicle/2.0/default/common/src/VehiclePropertyStore.cpp +++ b/automotive/vehicle/2.0/default/common/src/VehiclePropertyStore.cpp
@@ -58,6 +58,8 @@ return false; } // update the propertyValue. + // The timestamp in propertyStore should only be updated by the server side. It indicates + // the time when the event is generated by the server. valueToUpdate->timestamp = propValue.timestamp; valueToUpdate->value = propValue.value; if (updateStatus) {
diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedVehicleHal.cpp b/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedVehicleHal.cpp index b76aff9..84354c1 100644 --- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedVehicleHal.cpp +++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedVehicleHal.cpp
@@ -127,7 +127,9 @@ *outStatus = v != nullptr ? StatusCode::OK : StatusCode::INVALID_ARG; break; } - + if (v.get()) { + v->timestamp = elapsedRealtimeNano(); + } return v; } @@ -305,6 +307,7 @@ } if (v.get()) { + v->timestamp = elapsedRealtimeNano(); doHalEvent(std::move(v)); } }