Merge "Add seat backrest properties to the emulator for CTS tests" into tm-qpr-dev am: 0c1b340132 am: e7087a2d5d

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

Change-Id: I3d488e2890941bbe96fce2e7f35ad774aa36619d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sean Hong
2022-08-01 18:33:46 +00:00
committed by Automerger Merge Worker

View File

@@ -294,6 +294,102 @@ const std::vector<ConfigDeclaration> kVehicleProperties = {
{SEAT_2_RIGHT, {.int32Values = {0}}},
{SEAT_2_CENTER, {.int32Values = {0}}}}},
{.config = {.prop = toInt(VehicleProperty::SEAT_BACKREST_ANGLE_1_POS),
.access = VehiclePropertyAccess::READ_WRITE,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
.areaConfigs = {VehicleAreaConfig{.areaId = SEAT_1_LEFT,
.minInt32Value = -10,
.maxInt32Value = 10},
VehicleAreaConfig{.areaId = SEAT_1_RIGHT,
.minInt32Value = -10,
.maxInt32Value = 10},
VehicleAreaConfig{.areaId = SEAT_2_LEFT,
.minInt32Value = -10,
.maxInt32Value = 10},
VehicleAreaConfig{.areaId = SEAT_2_RIGHT,
.minInt32Value = -10,
.maxInt32Value = 10},
VehicleAreaConfig{.areaId = SEAT_2_CENTER,
.minInt32Value = -10,
.maxInt32Value = 10}}},
.initialAreaValues = {{SEAT_1_LEFT, {.int32Values = {0}}},
{SEAT_1_RIGHT, {.int32Values = {0}}},
{SEAT_2_LEFT, {.int32Values = {0}}},
{SEAT_2_RIGHT, {.int32Values = {0}}},
{SEAT_2_CENTER, {.int32Values = {0}}}}},
{.config = {.prop = toInt(VehicleProperty::SEAT_BACKREST_ANGLE_1_MOVE),
.access = VehiclePropertyAccess::READ_WRITE,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
.areaConfigs = {VehicleAreaConfig{.areaId = SEAT_1_LEFT,
.minInt32Value = -1,
.maxInt32Value = 1},
VehicleAreaConfig{.areaId = SEAT_1_RIGHT,
.minInt32Value = -1,
.maxInt32Value = 1},
VehicleAreaConfig{.areaId = SEAT_2_LEFT,
.minInt32Value = -1,
.maxInt32Value = 1},
VehicleAreaConfig{.areaId = SEAT_2_RIGHT,
.minInt32Value = -1,
.maxInt32Value = 1},
VehicleAreaConfig{.areaId = SEAT_2_CENTER,
.minInt32Value = -1,
.maxInt32Value = 1}}},
.initialAreaValues = {{SEAT_1_LEFT, {.int32Values = {0}}},
{SEAT_1_RIGHT, {.int32Values = {0}}},
{SEAT_2_LEFT, {.int32Values = {0}}},
{SEAT_2_RIGHT, {.int32Values = {0}}},
{SEAT_2_CENTER, {.int32Values = {0}}}}},
{.config = {.prop = toInt(VehicleProperty::SEAT_BACKREST_ANGLE_2_POS),
.access = VehiclePropertyAccess::READ_WRITE,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
.areaConfigs = {VehicleAreaConfig{.areaId = SEAT_1_LEFT,
.minInt32Value = -10,
.maxInt32Value = 10},
VehicleAreaConfig{.areaId = SEAT_1_RIGHT,
.minInt32Value = -10,
.maxInt32Value = 10},
VehicleAreaConfig{.areaId = SEAT_2_LEFT,
.minInt32Value = -10,
.maxInt32Value = 10},
VehicleAreaConfig{.areaId = SEAT_2_RIGHT,
.minInt32Value = -10,
.maxInt32Value = 10},
VehicleAreaConfig{.areaId = SEAT_2_CENTER,
.minInt32Value = -10,
.maxInt32Value = 10}}},
.initialAreaValues = {{SEAT_1_LEFT, {.int32Values = {0}}},
{SEAT_1_RIGHT, {.int32Values = {0}}},
{SEAT_2_LEFT, {.int32Values = {0}}},
{SEAT_2_RIGHT, {.int32Values = {0}}},
{SEAT_2_CENTER, {.int32Values = {0}}}}},
{.config = {.prop = toInt(VehicleProperty::SEAT_BACKREST_ANGLE_2_MOVE),
.access = VehiclePropertyAccess::READ_WRITE,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
.areaConfigs = {VehicleAreaConfig{.areaId = SEAT_1_LEFT,
.minInt32Value = -1,
.maxInt32Value = 1},
VehicleAreaConfig{.areaId = SEAT_1_RIGHT,
.minInt32Value = -1,
.maxInt32Value = 1},
VehicleAreaConfig{.areaId = SEAT_2_LEFT,
.minInt32Value = -1,
.maxInt32Value = 1},
VehicleAreaConfig{.areaId = SEAT_2_RIGHT,
.minInt32Value = -1,
.maxInt32Value = 1},
VehicleAreaConfig{.areaId = SEAT_2_CENTER,
.minInt32Value = -1,
.maxInt32Value = 1}}},
.initialAreaValues = {{SEAT_1_LEFT, {.int32Values = {0}}},
{SEAT_1_RIGHT, {.int32Values = {0}}},
{SEAT_2_LEFT, {.int32Values = {0}}},
{SEAT_2_RIGHT, {.int32Values = {0}}},
{SEAT_2_CENTER, {.int32Values = {0}}}}},
{.config =
{
.prop = toInt(VehicleProperty::SEAT_OCCUPANCY),