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

Commit 26fb04d3 authored by Aaqib Ismail's avatar Aaqib Ismail Committed by Automerger Merge Worker
Browse files

Merge "Add UNKNOWN fan direction to HVAC_FAN_DIRECTION_AVAILABLE for emulator"... 

Merge "Add UNKNOWN fan direction to HVAC_FAN_DIRECTION_AVAILABLE for emulator" into udc-dev am: bc591f43

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/22777025



Change-Id: I9cd14d54c47cb12a4b796e10c013731c19c10634
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d029c3cc bc591f43

automotive/vehicle/aidl/impl/default_config/JsonConfigLoader/src/JsonConfigLoader.cpp

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ const std::unordered_map<std::string, int> CONSTANTS_BY_NAME = { 
        {"WHEEL_FRONT_LEFT", WHEEL_FRONT_LEFT},

        {"CHARGE_PORT_FRONT_LEFT", CHARGE_PORT_FRONT_LEFT},

        {"CHARGE_PORT_REAR_LEFT", CHARGE_PORT_REAR_LEFT},

        {"FAN_DIRECTION_UNKNOWN", toInt(VehicleHvacFanDirection::UNKNOWN)},

        {"FAN_DIRECTION_FLOOR", FAN_DIRECTION_FLOOR},

        {"FAN_DIRECTION_FACE", FAN_DIRECTION_FACE},

        {"FAN_DIRECTION_DEFROST", FAN_DIRECTION_DEFROST},

automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json

+1 −0
Original line number Diff line number Diff line
@@ -2164,6 +2164,7 @@ 
            "property": "VehicleProperty::HVAC_FAN_DIRECTION_AVAILABLE",

            "defaultValue": {

                "int32Values": [

                    "Constants::FAN_DIRECTION_UNKNOWN",

                    "Constants::FAN_DIRECTION_FACE",

                    "Constants::FAN_DIRECTION_FLOOR",

                    "Constants::FAN_DIRECTION_FACE_FLOOR",