From 6ac46d6bf22fe5a1339eac85666d865b63376999 Mon Sep 17 00:00:00 2001 From: Tyler Trephan Date: Thu, 29 Jul 2021 09:46:06 -0700 Subject: [PATCH] Fixed failing CTS tests related vehicle properties on the AAOS emulator. -Added supported gears to CURRENT_GEAR config. -Changed INFO_EXTERIOR_DIMENSIONS to int32 array Test: atest CarPropertyManagerTest Bug: 194182294 Change-Id: I96d241d0c388b8fc397af9f45a8a8072a05ee8d1 --- .../2.0/default/impl/vhal_v2_0/DefaultConfig.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) 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 a85cdf06a5..6a0288f3a4 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 @@ -124,7 +124,7 @@ const ConfigDeclaration kVehicleProperties[]{ .access = VehiclePropertyAccess::READ, .changeMode = VehiclePropertyChangeMode::STATIC, }, - .initialValue = {.floatValues = {1776, 4950, 2008, 2140, 2984, 1665, 1667, 11800}}}, + .initialValue = {.int32Values = {1776, 4950, 2008, 2140, 2984, 1665, 1667, 11800}}}, {.config = { .prop = toInt(VehicleProperty::PERF_VEHICLE_SPEED), @@ -328,6 +328,11 @@ const ConfigDeclaration kVehicleProperties[]{ .prop = toInt(VehicleProperty::CURRENT_GEAR), .access = VehiclePropertyAccess::READ, .changeMode = VehiclePropertyChangeMode::ON_CHANGE, + .configArray = {(int)VehicleGear::GEAR_PARK, + (int)VehicleGear::GEAR_NEUTRAL, + (int)VehicleGear::GEAR_REVERSE, (int)VehicleGear::GEAR_1, + (int)VehicleGear::GEAR_2, (int)VehicleGear::GEAR_3, + (int)VehicleGear::GEAR_4, (int)VehicleGear::GEAR_5}, }, .initialValue = {.int32Values = {toInt(VehicleGear::GEAR_PARK)}}}, @@ -1072,8 +1077,8 @@ const ConfigDeclaration kVehicleProperties[]{ .access = VehiclePropertyAccess::READ, .changeMode = VehiclePropertyChangeMode::ON_CHANGE, }, - .initialValue = {.int32Values = {0 /* Off */, -1, -1, -1, -1 /* Bounds */, - -1, -1, -1, -1 /* Insets */}}, + .initialValue = {.int32Values = {0 /* Off */, -1, -1, -1, -1 /* Bounds */, -1, -1, + -1, -1 /* Insets */}}, }, { .config = @@ -1126,9 +1131,9 @@ const ConfigDeclaration kVehicleProperties[]{ .changeMode = VehiclePropertyChangeMode::ON_CHANGE, .configArray = {0, 0, 0, 11, 0, 0, 0, 0, 16}, }, - .initialValue = {.int32Values = {0 /* Off */, -1, -1, -1, -1 /* Bounds */, - -1, -1, -1, -1 /* Insets */, - 0 /* ClusterHome */, -1 /* ClusterNone */}}, + .initialValue = {.int32Values = {0 /* Off */, -1, -1, -1, -1 /* Bounds */, -1, -1, + -1, -1 /* Insets */, 0 /* ClusterHome */, + -1 /* ClusterNone */}}, }, { .config =