commit 5d6a91ccceeb34b44b06e16cd12becadb78ff68e
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 07 00:59:23 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 07 00:59:24 2017 +0000
tree 2213aec00144d3c2cef654dfc0e9937a1df8a41d
parent d59b0cab7077a5c638adbd4a50cbaaabcef85726
parent 1ba0d5ee0586b6fa1b76dd9d3aedd20dae0e5f5d

Merge "Fix sensor event in vehicle HAL emulator"

automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.cpp

diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.cpp b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.cpp
index e3c83d7..4cdd3f7 100644
--- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.cpp
+++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.cpp
@@ -118,6 +118,7 @@
 
     val.prop = protoVal.prop();
     val.areaId = protoVal.area_id();
+    val.timestamp = elapsedRealtimeNano();
 
     // Copy value data if it is set.  This automatically handles complex data types if needed.
     if (protoVal.has_string_value()) {
@@ -456,7 +457,7 @@
         VehiclePropValue* internalPropValue = getVehiclePropValueLocked(propId, areaId);
         if (internalPropValue != nullptr) {
             internalPropValue->value = propValue.value;
-            internalPropValue->timestamp = elapsedRealtimeNano();
+            internalPropValue->timestamp = propValue.timestamp;
             status = StatusCode::OK;
         }
     }