From 590607780ab47c3d48390c74cb2762438316d30f Mon Sep 17 00:00:00 2001 From: Jordan Jozwiak Date: Tue, 11 Aug 2020 14:40:44 -0700 Subject: [PATCH] Add INFO_MODEL and INFO_MODEL_YEAR default values Bug: 162611157 Test: adb shell cmd car_service get-carpropertyconfig | grep MODEL Change-Id: Iff9f763aa624a2002b0dd326316410a93a47d5c0 Merged-In: Iff9f763aa624a2002b0dd326316410a93a47d5c0 (cherry picked from commit 5aa08b7d592cfc83c446c8bb6e67ac79cf67aa02) --- .../2.0/default/impl/vhal_v2_0/DefaultConfig.h | 14 ++++++++++++++ 1 file changed, 14 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 16c33b9d19..16e1bf7291 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 @@ -264,6 +264,20 @@ const ConfigDeclaration kVehicleProperties[]{ .changeMode = VehiclePropertyChangeMode::STATIC, }, .initialValue = {.stringValue = "Toy Vehicle"}}, + {.config = + { + .prop = toInt(VehicleProperty::INFO_MODEL), + .access = VehiclePropertyAccess::READ, + .changeMode = VehiclePropertyChangeMode::STATIC, + }, + .initialValue = {.stringValue = "Speedy Model"}}, + {.config = + { + .prop = toInt(VehicleProperty::INFO_MODEL_YEAR), + .access = VehiclePropertyAccess::READ, + .changeMode = VehiclePropertyChangeMode::STATIC, + }, + .initialValue = {.int32Values = {2020}}}, {.config = { .prop = toInt(VehicleProperty::INFO_EXTERIOR_DIMENSIONS),