commit 71b2f5cd736f3a9aac8a9356b049d20ea76edb88
author Keun-young Park <keunyoung@google.com> Thu Mar 10 18:44:40 2016 -0800
committer Keun-young Park <keunyoung@google.com> Tue Mar 15 12:25:13 2016 -0700
tree 809d08ec632d9a9e5332606f48ab70581ae81fd2
parent 569ba04e9c4d05571d88daeac3367733541206db

vehicle hal refactoring from hal review

- call release_memory_from_get for freeing memory allocated
  from get call
- add retry for NOT_READY error which can happen at initial
  stage
- simplify zoned properties with missing multiple mins/maxs for
  zoned properties
- update HVAC API to return min/max values per each zone
- change HVACV API to return all zones available
  (renamed to getZones())
- fix missing write permision to property 0 which
  is used to gatekeep hal mocking

bug: 27597338, 27596281

Change-Id: I353acc0398f62c4933491e43592ea598d17d2422

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 331f93c..3ac5040 100644
--- a/libvehiclenetwork/java/src/com/android/car/vehiclenetwork/VehicleNetwork.java
+++ b/libvehiclenetwork/java/src/com/android/car/vehiclenetwork/VehicleNetwork.java
@@ -31,7 +31,6 @@
 import com.android.car.vehiclenetwork.VehicleNetworkProto.VehiclePropConfigs;
 import com.android.car.vehiclenetwork.VehicleNetworkProto.VehiclePropValue;
 import com.android.car.vehiclenetwork.VehicleNetworkProto.VehiclePropValues;
-import com.android.car.vehiclenetwork.VehicleNetworkProto.ZonedValue;
 import com.android.internal.annotations.GuardedBy;
 
 import java.lang.ref.WeakReference;
@@ -312,10 +311,10 @@
     public int getZonedIntProperty(int property, int zone) throws IllegalArgumentException {
         VehiclePropValue v = getProperty(
                 property, zone, VehicleValueType.VEHICLE_VALUE_TYPE_ZONED_INT32);
-        if (v.getZonedValue().getInt32ValuesCount() != 1) {
+        if (v.getInt32ValuesCount() != 1) {
             throw new IllegalStateException();
         }
-        return v.getZonedValue().getInt32Values(0);
+        return v.getInt32Values(0);
     }
 
     /**
@@ -335,8 +334,8 @@
             throws IllegalArgumentException {
         VehiclePropValue v = getProperty(
                 property, zone, VehicleValueType.VEHICLE_VALUE_TYPE_ZONED_INT32);
-        assertVectorLength(v.getZonedValue().getInt32ValuesCount(), property, v.getValueType());
-        return toIntArray(v.getZonedValue().getInt32ValuesList());
+        assertVectorLength(v.getInt32ValuesCount(), property, v.getValueType());
+        return toIntArray(v.getInt32ValuesList());
     }
 
     /**
@@ -368,8 +367,8 @@
             throws IllegalArgumentException {
         VehiclePropValue v = getProperty(property, zone,
                 VehicleValueType.VEHICLE_VALUE_TYPE_ZONED_FLOAT);
-        assertVectorLength(v.getZonedValue().getFloatValuesCount(), property, v.getValueType());
-        return toFloatArray(v.getZonedValue().getFloatValuesList());
+        assertVectorLength(v.getFloatValuesCount(), property, v.getValueType());
+        return toFloatArray(v.getFloatValuesList());
     }
 
     /**
@@ -694,9 +693,7 @@
                 VehiclePropValueUtil.createBuilder(property, valueType, 0);
 
         if (zone != NO_ZONE) {
-            valuePrototypeBuilder.setZonedValue(ZonedValue.newBuilder().
-                    setZoneOrWindow(zone).
-                    build());
+            valuePrototypeBuilder.setZone(zone);
         }
 
         VehiclePropValue v = getProperty(valuePrototypeBuilder.build());