Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit caae0cc6 authored by Pavel Maltsev's avatar Pavel Maltsev Committed by Android (Google) Code Review
Browse files

Merge changes I1610beb9,Ibcf607d0 

* changes:
  Fix typo CELCIUS -> CELSIUS in Vehicle HAL
  Fix config map in default Vehicle HAL impl
parents 0e5e908e 7005f9f6

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

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ public: 
    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

+4 −4
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ enum VehicleProperty: int32_t { 
     *

     * @change_mode VehiclePropertyChangeMode:ON_CHANGE|VehiclePropertyChangeMode:CONTINUOUS

     * @access VehiclePropertyAccess:READ

     * @unit VehicleUnit:CELCIUS

     * @unit VehicleUnit:CELSIUS

     */

    ENGINE_COOLANT_TEMP = (

        0x0301
@@ -204,7 +204,7 @@ enum VehicleProperty: int32_t { 
     *

     * @change_mode VehiclePropertyChangeMode:ON_CHANGE|VehiclePropertyChangeMode:CONTINUOUS

     * @access VehiclePropertyAccess:READ

     * @unit VehicleUnit:CELCIUS

     * @unit VehicleUnit:CELSIUS

     */

    ENGINE_OIL_TEMP = (

        0x0304
@@ -645,7 +645,7 @@ enum VehicleProperty: int32_t { 
     *

     * @change_mode VehiclePropertyChangeMode:ON_CHANGE|VehiclePropertyChangeMode:CONTINUOUS

     * @access VehiclePropertyAccess:READ

     * @unit VehicleUnit:CELCIUS

     * @unit VehicleUnit:CELSIUS

     */

    ENV_OUTSIDE_TEMPERATURE = (

        0x0703
@@ -658,7 +658,7 @@ enum VehicleProperty: int32_t { 
     *

     * @change_mode VehiclePropertyChangeMode:ON_CHANGE|VehiclePropertyChangeMode:CONTINUOUS

     * @access VehiclePropertyAccess:READ

     * @unit VehicleUnit:CELCIUS

     * @unit VehicleUnit:CELSIUS

     */

    ENV_CABIN_TEMPERATURE = (

        0x0704