commit dfccc5a6bd49b34b22968261f464442d7dc9920b
author Pavel Maltsev <pavelm@google.com> Mon Apr 11 21:56:04 2016 -0700
committer Pavel Maltsev <pavelm@google.com> Wed Apr 13 12:11:53 2016 -0700
tree 9ddbe696aa3483485dbef8f3ea6050265c8ec9b2
parent efc7a7a496335a54ffc3869be8f9247d1085755f

Publish current prop state in VNS when subscribed

Change-Id: I6962d913ac9d910e4bea7e7e117252ff23f0228a
Fix: 27976343

service/src/com/android/car/DrivingStatePolicy.java

diff --git a/service/src/com/android/car/DrivingStatePolicy.java b/service/src/com/android/car/DrivingStatePolicy.java
index 2b2402f..f8baba2 100644
--- a/service/src/com/android/car/DrivingStatePolicy.java
+++ b/service/src/com/android/car/DrivingStatePolicy.java
@@ -24,8 +24,6 @@
 import android.os.SystemClock;
 import android.util.Log;
 
-import com.android.car.hal.SensorHalServiceBase.SensorListener;
-
 import java.io.PrintWriter;
 import java.util.List;
 
@@ -97,7 +95,10 @@
                     sensorType);
             return null;
         }
-        return createEvent(CarSensorEvent.DRIVE_STATUS_FULLY_RESTRICTED);
+        // There's a race condition and timestamp from vehicle HAL could be slightly less
+        // then current call to SystemClock.elapsedRealtimeNanos() will return.
+        // We want vehicle HAL value always override this default value so we set timestamp to 0.
+        return createEvent(CarSensorEvent.DRIVE_STATUS_FULLY_RESTRICTED, 0 /* timestamp */);
     }
 
     @Override
@@ -202,8 +203,15 @@
     }
 
     private static CarSensorEvent createEvent(int drivingState) {
-        CarSensorEvent event = new CarSensorEvent(CarSensorManager.SENSOR_TYPE_DRIVING_STATUS,
-                SystemClock.elapsedRealtimeNanos(), 0, 1);
+        return createEvent(drivingState, SystemClock.elapsedRealtimeNanos());
+    }
+
+    private static CarSensorEvent createEvent(int drivingState, long timestamp) {
+        CarSensorEvent event = new CarSensorEvent(
+                CarSensorManager.SENSOR_TYPE_DRIVING_STATUS,
+                timestamp,
+                0 /* float values */,
+                1 /* int values */);
         event.intValues[0] = drivingState;
         return event;
     }