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

Commit 73c85334 authored by Liana Kazanova's avatar Liana Kazanova Committed by Android (Google) Code Review
Browse files

Merge "Revert "Change HVAC_MAX_DEFROST_ON to front and back row area IDs"" into main

parents 861fe949 0a36f19c

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

+1 −2
Original line number Diff line number Diff line
@@ -449,8 +449,7 @@ const ConfigDeclaration kVehicleProperties[]{ 
        {.config = {.prop = toInt(VehicleProperty::HVAC_MAX_DEFROST_ON),

                    .access = VehiclePropertyAccess::READ_WRITE,

                    .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

                    .areaConfigs = {VehicleAreaConfig{.areaId = HVAC_FRONT_ROW},

                                    VehicleAreaConfig{.areaId = HVAC_REAR_ROW}}},

                    .areaConfigs = {VehicleAreaConfig{.areaId = HVAC_ALL}}},

         .initialValue = {.int32Values = {0}}},



        {.config = {.prop = toInt(VehicleProperty::HVAC_RECIRC_ON),

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

+0 −3
Original line number Diff line number Diff line
@@ -50,9 +50,6 @@ constexpr int ALL_WHEELS = 
          VehicleAreaWheel::LEFT_REAR | VehicleAreaWheel::RIGHT_REAR);

constexpr int SEAT_1_LEFT = (int)(VehicleAreaSeat::ROW_1_LEFT);

constexpr int SEAT_1_RIGHT = (int)(VehicleAreaSeat::ROW_1_RIGHT);

constexpr int HVAC_FRONT_ROW = (int)(VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT);

constexpr int HVAC_REAR_ROW = (int)(VehicleAreaSeat::ROW_2_LEFT | VehicleAreaSeat::ROW_2_CENTER |

                                    VehicleAreaSeat::ROW_2_RIGHT);

constexpr int HVAC_LEFT = (int)(VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_2_LEFT |

                                VehicleAreaSeat::ROW_2_CENTER);

constexpr int HVAC_RIGHT = (int)(VehicleAreaSeat::ROW_1_RIGHT | VehicleAreaSeat::ROW_2_RIGHT);

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

+0 −2
Original line number Diff line number Diff line
@@ -104,8 +104,6 @@ const std::unordered_map<std::string, int> CONSTANTS_BY_NAME = { 
        {"HVAC_ALL", HVAC_ALL},

        {"HVAC_LEFT", HVAC_LEFT},

        {"HVAC_RIGHT", HVAC_RIGHT},

        {"HVAC_FRONT_ROW", HVAC_FRONT_ROW},

        {"HVAC_REAR_ROW", HVAC_REAR_ROW},

        {"WINDOW_1_LEFT", WINDOW_1_LEFT},

        {"WINDOW_1_RIGHT", WINDOW_1_RIGHT},

        {"WINDOW_2_LEFT", WINDOW_2_LEFT},

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

+11 −2
Original line number Diff line number Diff line
@@ -2033,10 +2033,19 @@ 
            },

            "areas": [

                {

                    "areaId": "Constants::HVAC_FRONT_ROW"

                    "areaId": "Constants::SEAT_1_LEFT"

                },

                {

                    "areaId": "Constants::SEAT_1_RIGHT"

                },

                {

                    "areaId": "Constants::HVAC_REAR_ROW"

                    "areaId": "Constants::SEAT_2_LEFT"

                },

                {

                    "areaId": "Constants::SEAT_2_RIGHT"

                },

                {

                    "areaId": "Constants::SEAT_2_CENTER"

                }

            ]

        },

automotive/vehicle/aidl/impl/utils/common/include/PropertyUtils.h

+0 −2
Original line number Diff line number Diff line
@@ -97,8 +97,6 @@ constexpr int ALL_WHEELS = 
constexpr int HVAC_LEFT = SEAT_1_LEFT | SEAT_2_LEFT | SEAT_2_CENTER;

constexpr int HVAC_RIGHT = SEAT_1_RIGHT | SEAT_2_RIGHT;

constexpr int HVAC_ALL = HVAC_LEFT | HVAC_RIGHT;

constexpr int HVAC_FRONT_ROW = SEAT_1_LEFT | SEAT_1_RIGHT;

constexpr int HVAC_REAR_ROW = SEAT_2_LEFT | SEAT_2_CENTER | SEAT_2_RIGHT;



}  // namespace vehicle

}  // namespace automotive