commit 0727f9536803bf13e49ff73bd1ed04489b592c56
author Keun-young Park <keunyoung@google.com> Mon Dec 21 14:30:07 2015 -0800
committer Keun-young Park <keunyoung@google.com> Wed Jan 06 15:17:08 2016 -0800
tree 1cbbd6af12787a4040dc2cda8315db1dafd47516
parent 7965fa2ad142d4ce092dcdb98dffc019f59192d1

vehicle hal update: add zone to subscription and others

- add zones to subscribe and mocking
- extend config_flags to config_array

bug: 25265553

Change-Id: Icfc1911178daa4ff4b5b6f12bc8e0002af5530bb

libvehiclenetwork/java/src/com/android/car/vehiclenetwork/VehicleNetwork.java

diff --git a/libvehiclenetwork/java/src/com/android/car/vehiclenetwork/VehicleNetwork.java b/libvehiclenetwork/java/src/com/android/car/vehiclenetwork/VehicleNetwork.java
index ee20d78..a43c485 100644
--- a/libvehiclenetwork/java/src/com/android/car/vehiclenetwork/VehicleNetwork.java
+++ b/libvehiclenetwork/java/src/com/android/car/vehiclenetwork/VehicleNetwork.java
@@ -52,7 +52,7 @@
         VehiclePropConfigs onListProperties();
         void onPropertySet(VehiclePropValue value);
         VehiclePropValue onPropertyGet(VehiclePropValue value);
-        void onPropertySubscribe(int property, int sampleRate);
+        void onPropertySubscribe(int property, float sampleRate, int zones);
         void onPropertyUnsubscribe(int property);
     }
 
@@ -423,8 +423,19 @@
      * @throws IllegalArgumentException
      */
     public void subscribe(int property, float sampleRate) throws IllegalArgumentException {
+        subscribe(property, sampleRate, 0);
+    }
+
+    /**
+     * Subscribe given property with given sample rate.
+     * @param property
+     * @param sampleRate
+     * @throws IllegalArgumentException
+     */
+    public void subscribe(int property, float sampleRate, int zones)
+            throws IllegalArgumentException {
         try {
-            mService.subscribe(mVehicleNetworkListener, property, sampleRate);
+            mService.subscribe(mVehicleNetworkListener, property, sampleRate, zones);
         } catch (RemoteException e) {
             handleRemoteException(e);
         }
@@ -689,12 +700,12 @@
         }
 
         @Override
-        public void onPropertySubscribe(int property, int sampleRate) {
+        public void onPropertySubscribe(int property, float sampleRate, int zones) {
             VehicleNetwork vehicleNetwork = mVehicleNetwork.get();
             if (vehicleNetwork == null) {
                 return;
             }
-            vehicleNetwork.getHalMock().onPropertySubscribe(property, sampleRate);
+            vehicleNetwork.getHalMock().onPropertySubscribe(property, sampleRate, zones);
         }
 
         @Override