summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhuoyao Zhang2017-02-14 12:51:26 -0600
committerAndroid (Google) Code Review2017-02-14 12:51:27 -0600
commitf008f8fdc436b9638001c0f7100999c7cbc25268 (patch)
tree223f4d802adbb701f96cf67a3aea2aef4c2e4d63 /automotive
parent7ddf7abff5b33eb294cf8cd896a99a1c6ca4fcbc (diff)
parent3bef939f948ba93bebd92ee59f4a4f1a099b0e42 (diff)
downloadplatform-hardware-interfaces-f008f8fdc436b9638001c0f7100999c7cbc25268.tar.gz
platform-hardware-interfaces-f008f8fdc436b9638001c0f7100999c7cbc25268.tar.xz
platform-hardware-interfaces-f008f8fdc436b9638001c0f7100999c7cbc25268.zip
Merge "Update .vts files on master based on the latest .hal file and hidl-gen"
Diffstat (limited to 'automotive')
-rw-r--r--automotive/vehicle/2.0/vts/Vehicle.vts15
-rw-r--r--automotive/vehicle/2.0/vts/VehicleCallback.vts5
-rw-r--r--automotive/vehicle/2.0/vts/types.vts121
3 files changed, 124 insertions, 17 deletions
diff --git a/automotive/vehicle/2.0/vts/Vehicle.vts b/automotive/vehicle/2.0/vts/Vehicle.vts
index 535d4b86..aa12f0c9 100644
--- a/automotive/vehicle/2.0/vts/Vehicle.vts
+++ b/automotive/vehicle/2.0/vts/Vehicle.vts
@@ -6,6 +6,7 @@ package: "android.hardware.automotive.vehicle"
6 6
7import: "android.hardware.automotive.vehicle@2.0::IVehicleCallback" 7import: "android.hardware.automotive.vehicle@2.0::IVehicleCallback"
8import: "android.hardware.automotive.vehicle@2.0::types" 8import: "android.hardware.automotive.vehicle@2.0::types"
9import: "android.hidl.base@1.0::types"
9 10
10interface: { 11interface: {
11 api: { 12 api: {
@@ -35,8 +36,8 @@ interface: {
35 arg: { 36 arg: {
36 type: TYPE_VECTOR 37 type: TYPE_VECTOR
37 vector_value: { 38 vector_value: {
38 type: TYPE_ENUM 39 type: TYPE_SCALAR
39 predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehicleProperty" 40 scalar_type: "int32_t"
40 } 41 }
41 } 42 }
42 } 43 }
@@ -77,8 +78,7 @@ interface: {
77 } 78 }
78 arg: { 79 arg: {
79 type: TYPE_HIDL_CALLBACK 80 type: TYPE_HIDL_CALLBACK
80 predefined_type: "IVehicleCallback" 81 predefined_type: "::android::hardware::automotive::vehicle::V2_0::IVehicleCallback"
81 is_callback: true
82 } 82 }
83 arg: { 83 arg: {
84 type: TYPE_VECTOR 84 type: TYPE_VECTOR
@@ -97,12 +97,11 @@ interface: {
97 } 97 }
98 arg: { 98 arg: {
99 type: TYPE_HIDL_CALLBACK 99 type: TYPE_HIDL_CALLBACK
100 predefined_type: "IVehicleCallback" 100 predefined_type: "::android::hardware::automotive::vehicle::V2_0::IVehicleCallback"
101 is_callback: true
102 } 101 }
103 arg: { 102 arg: {
104 type: TYPE_ENUM 103 type: TYPE_SCALAR
105 predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehicleProperty" 104 scalar_type: "int32_t"
106 } 105 }
107 } 106 }
108 107
diff --git a/automotive/vehicle/2.0/vts/VehicleCallback.vts b/automotive/vehicle/2.0/vts/VehicleCallback.vts
index 3589fde1..e4815d54 100644
--- a/automotive/vehicle/2.0/vts/VehicleCallback.vts
+++ b/automotive/vehicle/2.0/vts/VehicleCallback.vts
@@ -5,6 +5,7 @@ component_name: "IVehicleCallback"
5package: "android.hardware.automotive.vehicle" 5package: "android.hardware.automotive.vehicle"
6 6
7import: "android.hardware.automotive.vehicle@2.0::types" 7import: "android.hardware.automotive.vehicle@2.0::types"
8import: "android.hidl.base@1.0::types"
8 9
9interface: { 10interface: {
10 api: { 11 api: {
@@ -33,8 +34,8 @@ interface: {
33 predefined_type: "::android::hardware::automotive::vehicle::V2_0::StatusCode" 34 predefined_type: "::android::hardware::automotive::vehicle::V2_0::StatusCode"
34 } 35 }
35 arg: { 36 arg: {
36 type: TYPE_ENUM 37 type: TYPE_SCALAR
37 predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehicleProperty" 38 scalar_type: "int32_t"
38 } 39 }
39 arg: { 40 arg: {
40 type: TYPE_SCALAR 41 type: TYPE_SCALAR
diff --git a/automotive/vehicle/2.0/vts/types.vts b/automotive/vehicle/2.0/vts/types.vts
index b8a9f835..3868c996 100644
--- a/automotive/vehicle/2.0/vts/types.vts
+++ b/automotive/vehicle/2.0/vts/types.vts
@@ -162,6 +162,10 @@ attribute: {
162 scalar_value: { 162 scalar_value: {
163 int32_t: 291504901 163 int32_t: 291504901
164 } 164 }
165 enumerator: "WHEEL_TICK"
166 scalar_value: {
167 int32_t: 291570438
168 }
165 enumerator: "GEAR_SELECTION" 169 enumerator: "GEAR_SELECTION"
166 scalar_value: { 170 scalar_value: {
167 int32_t: 289408000 171 int32_t: 289408000
@@ -282,10 +286,18 @@ attribute: {
282 scalar_value: { 286 scalar_value: {
283 int32_t: 289474816 287 int32_t: 289474816
284 } 288 }
289 enumerator: "AUDIO_FOCUS_EXT_SYNC"
290 scalar_value: {
291 int32_t: 289474832
292 }
285 enumerator: "AUDIO_VOLUME" 293 enumerator: "AUDIO_VOLUME"
286 scalar_value: { 294 scalar_value: {
287 int32_t: 289474817 295 int32_t: 289474817
288 } 296 }
297 enumerator: "AUDIO_VOLUME_EXT_SYNC"
298 scalar_value: {
299 int32_t: 289474833
300 }
289 enumerator: "AUDIO_VOLUME_LIMIT" 301 enumerator: "AUDIO_VOLUME_LIMIT"
290 scalar_value: { 302 scalar_value: {
291 int32_t: 289474818 303 int32_t: 289474818
@@ -302,9 +314,17 @@ attribute: {
302 scalar_value: { 314 scalar_value: {
303 int32_t: 289474821 315 int32_t: 289474821
304 } 316 }
317 enumerator: "AUDIO_STREAM_STATE"
318 scalar_value: {
319 int32_t: 289474822
320 }
321 enumerator: "AUDIO_PARAMETERS"
322 scalar_value: {
323 int32_t: 286263559
324 }
305 enumerator: "AP_POWER_STATE" 325 enumerator: "AP_POWER_STATE"
306 scalar_value: { 326 scalar_value: {
307 int32_t: 2560 327 int32_t: 289475072
308 } 328 }
309 enumerator: "DISPLAY_BRIGHTNESS" 329 enumerator: "DISPLAY_BRIGHTNESS"
310 scalar_value: { 330 scalar_value: {
@@ -506,6 +526,14 @@ attribute: {
506 scalar_value: { 526 scalar_value: {
507 int32_t: 299896065 527 int32_t: 299896065
508 } 528 }
529 enumerator: "OBD2_FREEZE_FRAME_INFO"
530 scalar_value: {
531 int32_t: 299896066
532 }
533 enumerator: "OBD2_FREEZE_FRAME_CLEAR"
534 scalar_value: {
535 int32_t: 299896067
536 }
509 } 537 }
510} 538}
511 539
@@ -1585,8 +1613,8 @@ attribute: {
1585 type: TYPE_STRUCT 1613 type: TYPE_STRUCT
1586 struct_value: { 1614 struct_value: {
1587 name: "prop" 1615 name: "prop"
1588 type: TYPE_ENUM 1616 type: TYPE_SCALAR
1589 predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehicleProperty" 1617 scalar_type: "int32_t"
1590 } 1618 }
1591 struct_value: { 1619 struct_value: {
1592 name: "access" 1620 name: "access"
@@ -1685,8 +1713,8 @@ attribute: {
1685 } 1713 }
1686 struct_value: { 1714 struct_value: {
1687 name: "prop" 1715 name: "prop"
1688 type: TYPE_ENUM 1716 type: TYPE_SCALAR
1689 predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehicleProperty" 1717 scalar_type: "int32_t"
1690 } 1718 }
1691 struct_value: { 1719 struct_value: {
1692 name: "timestamp" 1720 name: "timestamp"
@@ -1793,8 +1821,8 @@ attribute: {
1793 type: TYPE_STRUCT 1821 type: TYPE_STRUCT
1794 struct_value: { 1822 struct_value: {
1795 name: "propId" 1823 name: "propId"
1796 type: TYPE_ENUM 1824 type: TYPE_SCALAR
1797 predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehicleProperty" 1825 scalar_type: "int32_t"
1798 } 1826 }
1799 struct_value: { 1827 struct_value: {
1800 name: "vehicleAreas" 1828 name: "vehicleAreas"
@@ -2104,6 +2132,35 @@ attribute: {
2104} 2132}
2105 2133
2106attribute: { 2134attribute: {
2135 name: "::android::hardware::automotive::vehicle::V2_0::Wheel"
2136 type: TYPE_ENUM
2137 enum_value: {
2138 scalar_type: "int32_t"
2139
2140 enumerator: "UNKNOWN"
2141 scalar_value: {
2142 int32_t: 0
2143 }
2144 enumerator: "LEFT_FRONT"
2145 scalar_value: {
2146 int32_t: 1
2147 }
2148 enumerator: "RIGHT_FRONT"
2149 scalar_value: {
2150 int32_t: 2
2151 }
2152 enumerator: "LEFT_REAR"
2153 scalar_value: {
2154 int32_t: 4
2155 }
2156 enumerator: "RIGHT_REAR"
2157 scalar_value: {
2158 int32_t: 8
2159 }
2160 }
2161}
2162
2163attribute: {
2107 name: "::android::hardware::automotive::vehicle::V2_0::SecondaryAirStatus" 2164 name: "::android::hardware::automotive::vehicle::V2_0::SecondaryAirStatus"
2108 type: TYPE_ENUM 2165 type: TYPE_ENUM
2109 enum_value: { 2166 enum_value: {
@@ -2251,6 +2308,14 @@ attribute: {
2251 scalar_value: { 2308 scalar_value: {
2252 int32_t: 2 2309 int32_t: 2
2253 } 2310 }
2311 enumerator: "IGNITION_SPECIFIC_MONITORS"
2312 scalar_value: {
2313 int32_t: 3
2314 }
2315 enumerator: "INTAKE_AIR_TEMPERATURE"
2316 scalar_value: {
2317 int32_t: 4
2318 }
2254 enumerator: "COMMANDED_SECONDARY_AIR_STATUS" 2319 enumerator: "COMMANDED_SECONDARY_AIR_STATUS"
2255 scalar_value: { 2320 scalar_value: {
2256 int32_t: 5 2321 int32_t: 5
@@ -2671,3 +2736,45 @@ attribute: {
2671 } 2736 }
2672} 2737}
2673 2738
2739attribute: {
2740 name: "::android::hardware::automotive::vehicle::V2_0::VmsMessageType"
2741 type: TYPE_ENUM
2742 enum_value: {
2743 scalar_type: "int32_t"
2744
2745 enumerator: "SUBSCRIBE"
2746 scalar_value: {
2747 int32_t: 1
2748 }
2749 enumerator: "UNSUBSCRIBE"
2750 scalar_value: {
2751 int32_t: 2
2752 }
2753 enumerator: "DATA"
2754 scalar_value: {
2755 int32_t: 3
2756 }
2757 }
2758}
2759
2760attribute: {
2761 name: "::android::hardware::automotive::vehicle::V2_0::VmsMessageIntegerValuesIndex"
2762 type: TYPE_ENUM
2763 enum_value: {
2764 scalar_type: "int32_t"
2765
2766 enumerator: "VMS_MESSAGE_TYPE"
2767 scalar_value: {
2768 int32_t: 1
2769 }
2770 enumerator: "VMS_LAYER_ID"
2771 scalar_value: {
2772 int32_t: 2
2773 }
2774 enumerator: "VMS_LAYER_VERSION"
2775 scalar_value: {
2776 int32_t: 3
2777 }
2778 }
2779}
2780