Merge "Convert Vehicle Property to integer"

diff --cc vehicle/2.0/default/impl/DefaultConfig.h
index f4e1e53,85bba2c..c74ddc0
--- 1/vehicle/2.0/default/impl/DefaultConfig.h
--- 2/vehicle/2.0/default/impl/DefaultConfig.h
+++ b/vehicle/2.0/default/impl/DefaultConfig.h
@@@ -162,17 -162,15 +162,17 @@@ const VehiclePropConfig kVehiclePropert
      },
  
      {
-         .prop = VehicleProperty::OBD2_LIVE_FRAME,
+         .prop = toInt(VehicleProperty::OBD2_LIVE_FRAME),
          .access = VehiclePropertyAccess::READ,
          .changeMode = VehiclePropertyChangeMode::ON_CHANGE,
 +        .configArray = {0,0}
      },
  
      {
-         .prop = VehicleProperty::OBD2_FREEZE_FRAME,
+         .prop = toInt(VehicleProperty::OBD2_FREEZE_FRAME),
          .access = VehiclePropertyAccess::READ,
          .changeMode = VehiclePropertyChangeMode::ON_CHANGE,
 +        .configArray = {0,0}
      }
  };
  

diff --cc vehicle/2.0/default/impl/DefaultVehicleHal.cpp
Simple merge

diff --cc vehicle/2.0/default/impl/DefaultVehicleHal.h
index 165324e,b01c963..567ddf1
--- 1/vehicle/2.0/default/impl/DefaultVehicleHal.h
--- 2/vehicle/2.0/default/impl/DefaultVehicleHal.h
+++ b/vehicle/2.0/default/impl/DefaultVehicleHal.h
@@@ -41,13 -38,11 +41,13 @@@ public
      VehiclePropValuePtr get(const VehiclePropValue& requestedPropValue,
                              StatusCode* outStatus) override;
  
 +    void onCreate() override;
 +
      StatusCode set(const VehiclePropValue& propValue) override;
  
-     StatusCode subscribe(VehicleProperty property,
-                        int32_t areas,
-                        float sampleRate) {
+     StatusCode subscribe(int32_t /*property*/,
+                          int32_t /*areas*/,
+                          float /*sampleRate*/) override {
          // TODO(pavelm): implement
          return StatusCode::OK;
      }

diff --cc vehicle/2.0/types.hal
Simple merge