commit caae0cc641a93e9ad2e44da1223656264d93f52d
author Pavel Maltsev <pavelm@google.com> Thu Mar 16 18:24:35 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 16 18:24:36 2017 +0000
tree eaa4783742f928bc8bf623260a4da8678f1b55bc
parent 0e5e908e69f934e89fe159fc174df51fd64906a3
parent 7005f9f643751c39e70f35cc965e598b67bbde91

Merge changes I1610beb9,Ibcf607d0

* changes:
  Fix typo CELCIUS -> CELSIUS in Vehicle HAL
  Fix config map in default Vehicle HAL impl

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

diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.h b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.h
index 2efe05c..bbbe955 100644
--- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.h
+++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.h
@@ -47,7 +47,7 @@
     DefaultVehicleHal() : mRecurrentTimer(
             std::bind(&DefaultVehicleHal::onContinuousPropertyTimer, this, std::placeholders::_1)) {
         for (size_t i = 0; i < arraysize(kVehicleProperties); i++) {
-            mPropConfigMap[kVehicleProperties->prop] = &kVehicleProperties[i];
+            mPropConfigMap[kVehicleProperties[i].prop] = &kVehicleProperties[i];
         }
     }
 

automotive/vehicle/2.0/types.hal

diff --git a/automotive/vehicle/2.0/types.hal b/automotive/vehicle/2.0/types.hal
index b33b6ee..a998d33 100644
--- a/automotive/vehicle/2.0/types.hal
+++ b/automotive/vehicle/2.0/types.hal
@@ -191,7 +191,7 @@
      *
      * @change_mode VehiclePropertyChangeMode:ON_CHANGE|VehiclePropertyChangeMode:CONTINUOUS
      * @access VehiclePropertyAccess:READ
-     * @unit VehicleUnit:CELCIUS
+     * @unit VehicleUnit:CELSIUS
      */
     ENGINE_COOLANT_TEMP = (
         0x0301
@@ -204,7 +204,7 @@
      *
      * @change_mode VehiclePropertyChangeMode:ON_CHANGE|VehiclePropertyChangeMode:CONTINUOUS
      * @access VehiclePropertyAccess:READ
-     * @unit VehicleUnit:CELCIUS
+     * @unit VehicleUnit:CELSIUS
      */
     ENGINE_OIL_TEMP = (
         0x0304
@@ -645,7 +645,7 @@
      *
      * @change_mode VehiclePropertyChangeMode:ON_CHANGE|VehiclePropertyChangeMode:CONTINUOUS
      * @access VehiclePropertyAccess:READ
-     * @unit VehicleUnit:CELCIUS
+     * @unit VehicleUnit:CELSIUS
      */
     ENV_OUTSIDE_TEMPERATURE = (
         0x0703
@@ -658,7 +658,7 @@
      *
      * @change_mode VehiclePropertyChangeMode:ON_CHANGE|VehiclePropertyChangeMode:CONTINUOUS
      * @access VehiclePropertyAccess:READ
-     * @unit VehicleUnit:CELCIUS
+     * @unit VehicleUnit:CELSIUS
      */
     ENV_CABIN_TEMPERATURE = (
         0x0704