Merge "Specified in INFO_MAKE and INFO_MODEL HAL docs to use public names" into main
diff --git a/automotive/vehicle/aidl/emu_metadata/android.hardware.automotive.vehicle-types-meta.json b/automotive/vehicle/aidl/emu_metadata/android.hardware.automotive.vehicle-types-meta.json
index 735f8e6..0dc6281 100644
--- a/automotive/vehicle/aidl/emu_metadata/android.hardware.automotive.vehicle-types-meta.json
+++ b/automotive/vehicle/aidl/emu_metadata/android.hardware.automotive.vehicle-types-meta.json
@@ -11,12 +11,12 @@
{
"name": "Manufacturer of vehicle",
"value": 286261505,
- "description": "Manufacturer of vehicle"
+ "description": "Manufacturer of vehicle\nThis property must communicate the vehicle's public brand name."
},
{
"name": "Model of vehicle",
"value": 286261506,
- "description": "Model of vehicle"
+ "description": "Model of vehicle\nThis property must communicate the vehicle's public model name."
},
{
"name": "INFO_MODEL_YEAR",
diff --git a/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleProperty.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleProperty.aidl
index 099323c..1f3e967 100644
--- a/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleProperty.aidl
+++ b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleProperty.aidl
@@ -59,6 +59,8 @@
/**
* Manufacturer of vehicle
*
+ * This property must communicate the vehicle's public brand name.
+ *
* @change_mode VehiclePropertyChangeMode.STATIC
* @access VehiclePropertyAccess.READ
* @version 2
@@ -68,6 +70,8 @@
/**
* Model of vehicle
*
+ * This property must communicate the vehicle's public model name.
+ *
* @change_mode VehiclePropertyChangeMode.STATIC
* @access VehiclePropertyAccess.READ
* @version 2