commit 76907bbf13092a51d7dea3f2c06562a263d4278a
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Aug 19 21:21:51 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 19 21:21:51 2020 +0000
tree add92e141dea5666bb9226b5cc259467237c8852
parent 182b84b23e6426e2ad89d8e4bf58fba1468795e3
parent 0e2072ce4b0953af0fda7ceaa7d21dba3b3f5fbc

Merge "Add INFO_MODEL and INFO_MODEL_YEAR default values" into rvc-qpr-dev am: 0e2072ce4b

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

Change-Id: Id7365f87e72e454c7e6808369eee0a17de72435c

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

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 16c33b9..16e1bf7 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
@@ -266,6 +266,20 @@
          .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),
                          .access = VehiclePropertyAccess::READ,
                          .changeMode = VehiclePropertyChangeMode::STATIC,