From 2c820039ca149429a381c05ad4e111ef23a21a4e Mon Sep 17 00:00:00 2001 From: Gregory Clark Date: Mon, 8 Oct 2018 12:11:25 -0700 Subject: [PATCH] Add the window lock property. Bug: b/80429405 Test: Call carPropertyManager.setIntProperty Change-Id: I465c82f6735e714cd26397de281025e69f3e4c38 (cherry picked from commit d9ed04473eaa633a60a8f8a234a024c9816f4db9) --- .../vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h index e0b54d069b..9ffaf1e734 100644 --- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h +++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h @@ -36,6 +36,9 @@ constexpr int DOOR_1_LEFT = (int)VehicleAreaDoor::ROW_1_LEFT; constexpr int DOOR_1_RIGHT = (int)VehicleAreaDoor::ROW_1_RIGHT; constexpr int DOOR_2_LEFT = (int)VehicleAreaDoor::ROW_2_LEFT; constexpr int DOOR_2_RIGHT = (int)VehicleAreaDoor::ROW_2_RIGHT; +constexpr int WINDOW_1_LEFT = (int)VehicleAreaWindow::ROW_1_LEFT; +constexpr int WINDOW_2_LEFT = (int)VehicleAreaWindow::ROW_2_LEFT; +constexpr int WINDOW_2_RIGHT = (int)VehicleAreaWindow::ROW_2_RIGHT; constexpr int FAN_DIRECTION_FACE = (int)VehicleHvacFanDirection::FACE; constexpr int FAN_DIRECTION_FLOOR = (int)VehicleHvacFanDirection::FLOOR; constexpr int OBD2_LIVE_FRAME = (int)VehicleProperty::OBD2_LIVE_FRAME; @@ -576,6 +579,13 @@ const ConfigDeclaration kVehicleProperties[]{ .initialAreaValues = {{DOOR_1_LEFT, {.int32Values = {1}}}, {DOOR_1_RIGHT, {.int32Values = {1}}}}}, + {.config = {.prop = toInt(VehicleProperty::WINDOW_LOCK), + .access = VehiclePropertyAccess::READ_WRITE, + .changeMode = VehiclePropertyChangeMode::ON_CHANGE, + .areaConfigs = {VehicleAreaConfig{.areaId = WINDOW_1_LEFT | WINDOW_2_LEFT | + WINDOW_2_RIGHT}}}, + .initialAreaValues = {{WINDOW_1_LEFT | WINDOW_2_LEFT | WINDOW_2_RIGHT, {.int32Values = {0}}}}}, + {.config = { .prop = WHEEL_TICK,