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
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"
-rw-r--r--audio/common/2.0/vts/types.vts41
-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
-rw-r--r--biometrics/fingerprint/2.1/vts/BiometricsFingerprint.vts270
-rw-r--r--biometrics/fingerprint/2.1/vts/BiometricsFingerprintClientCallback.vts270
-rw-r--r--boot/1.0/vts/BootControl.vts1
-rw-r--r--contexthub/1.0/vts/Contexthub.vts485
-rw-r--r--contexthub/1.0/vts/ContexthubCallback.vts485
-rw-r--r--gatekeeper/1.0/vts/Gatekeeper.vts1
-rw-r--r--graphics/allocator/2.0/vts/Allocator.vts5
-rw-r--r--graphics/allocator/2.0/vts/AllocatorClient.vts467
-rw-r--r--graphics/allocator/2.0/vts/types.vts8
-rw-r--r--graphics/composer/2.1/vts/Composer.vts6
-rw-r--r--graphics/composer/2.1/vts/ComposerCallback.vts1
-rw-r--r--graphics/composer/2.1/vts/ComposerClient.vts14
-rw-r--r--graphics/mapper/2.0/vts/Mapper.vts1
-rw-r--r--light/2.0/vts/Light.vts1
-rw-r--r--memtrack/1.0/vts/Memtrack.vts1
-rw-r--r--power/1.0/vts/Power.vts1
-rw-r--r--radio/1.0/vts/RadioResponse.vts8
-rw-r--r--sensors/1.0/vts/Sensors.vts1
-rw-r--r--sensors/1.0/vts/types.vts11
-rw-r--r--thermal/1.0/vts/Thermal.vts1
-rw-r--r--thermal/1.0/vts/types.vts12
-rw-r--r--tv/cec/1.0/vts/HdmiCec.vts4
-rw-r--r--tv/cec/1.0/vts/HdmiCecCallback.vts1
-rw-r--r--tv/input/1.0/vts/TvInput.vts5
-rw-r--r--tv/input/1.0/vts/TvInputCallback.vts2
-rw-r--r--tv/input/1.0/vts/types.vts1922
-rw-r--r--vibrator/1.0/vts/Vibrator.vts1
-rw-r--r--vr/1.0/vts/Vr.vts1
32 files changed, 226 insertions, 3942 deletions
diff --git a/audio/common/2.0/vts/types.vts b/audio/common/2.0/vts/types.vts
index 8d1a9db1..d790573b 100644
--- a/audio/common/2.0/vts/types.vts
+++ b/audio/common/2.0/vts/types.vts
@@ -56,8 +56,8 @@ attribute: {
56 struct_value: { 56 struct_value: {
57 name: "node" 57 name: "node"
58 type: TYPE_ARRAY 58 type: TYPE_ARRAY
59 vector_size: 6
59 vector_value: { 60 vector_value: {
60 vector_size: 6
61 type: TYPE_SCALAR 61 type: TYPE_SCALAR
62 scalar_type: "uint8_t" 62 scalar_type: "uint8_t"
63 } 63 }
@@ -381,10 +381,14 @@ attribute: {
381 scalar_value: { 381 scalar_value: {
382 uint32_t: 553648128 382 uint32_t: 553648128
383 } 383 }
384 enumerator: "LDAC" 384 enumerator: "AC4"
385 scalar_value: { 385 scalar_value: {
386 uint32_t: 570425344 386 uint32_t: 570425344
387 } 387 }
388 enumerator: "LDAC"
389 scalar_value: {
390 uint32_t: 587202560
391 }
388 enumerator: "MAIN_MASK" 392 enumerator: "MAIN_MASK"
389 scalar_value: { 393 scalar_value: {
390 uint32_t: 4278190080 394 uint32_t: 4278190080
@@ -811,6 +815,10 @@ attribute: {
811 scalar_value: { 815 scalar_value: {
812 uint32_t: 48 816 uint32_t: 48
813 } 817 }
818 enumerator: "IN_6"
819 scalar_value: {
820 uint32_t: 252
821 }
814 enumerator: "IN_VOICE_UPLINK_MONO" 822 enumerator: "IN_VOICE_UPLINK_MONO"
815 scalar_value: { 823 scalar_value: {
816 uint32_t: 16400 824 uint32_t: 16400
@@ -1357,13 +1365,17 @@ attribute: {
1357 scalar_value: { 1365 scalar_value: {
1358 int32_t: 15 1366 int32_t: 15
1359 } 1367 }
1360 enumerator: "CNT" 1368 enumerator: "ASSISTANT"
1361 scalar_value: { 1369 scalar_value: {
1362 int32_t: 16 1370 int32_t: 16
1363 } 1371 }
1372 enumerator: "CNT"
1373 scalar_value: {
1374 int32_t: 17
1375 }
1364 enumerator: "MAX" 1376 enumerator: "MAX"
1365 scalar_value: { 1377 scalar_value: {
1366 int32_t: 15 1378 int32_t: 16
1367 } 1379 }
1368 } 1380 }
1369} 1381}
@@ -1545,8 +1557,8 @@ attribute: {
1545 struct_value: { 1557 struct_value: {
1546 name: "values" 1558 name: "values"
1547 type: TYPE_ARRAY 1559 type: TYPE_ARRAY
1560 vector_size: 32
1548 vector_value: { 1561 vector_value: {
1549 vector_size: 32
1550 type: TYPE_SCALAR 1562 type: TYPE_SCALAR
1551 scalar_type: "int32_t" 1563 scalar_type: "int32_t"
1552 } 1564 }
@@ -1620,8 +1632,8 @@ attribute: {
1620 struct_value: { 1632 struct_value: {
1621 name: "address" 1633 name: "address"
1622 type: TYPE_ARRAY 1634 type: TYPE_ARRAY
1635 vector_size: 32
1623 vector_value: { 1636 vector_value: {
1624 vector_size: 32
1625 type: TYPE_SCALAR 1637 type: TYPE_SCALAR
1626 scalar_type: "uint8_t" 1638 scalar_type: "uint8_t"
1627 } 1639 }
@@ -1785,8 +1797,8 @@ attribute: {
1785 struct_value: { 1797 struct_value: {
1786 name: "address" 1798 name: "address"
1787 type: TYPE_ARRAY 1799 type: TYPE_ARRAY
1800 vector_size: 32
1788 vector_value: { 1801 vector_value: {
1789 vector_size: 32
1790 type: TYPE_SCALAR 1802 type: TYPE_SCALAR
1791 scalar_type: "uint8_t" 1803 scalar_type: "uint8_t"
1792 } 1804 }
@@ -1925,3 +1937,18 @@ attribute: {
1925 } 1937 }
1926} 1938}
1927 1939
1940attribute: {
1941 name: "::android::hardware::audio::common::V2_0::ThreadInfo"
1942 type: TYPE_STRUCT
1943 struct_value: {
1944 name: "pid"
1945 type: TYPE_SCALAR
1946 scalar_type: "int64_t"
1947 }
1948 struct_value: {
1949 name: "tid"
1950 type: TYPE_SCALAR
1951 scalar_type: "int64_t"
1952 }
1953}
1954
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
diff --git a/biometrics/fingerprint/2.1/vts/BiometricsFingerprint.vts b/biometrics/fingerprint/2.1/vts/BiometricsFingerprint.vts
index 475333ef..0581da0b 100644
--- a/biometrics/fingerprint/2.1/vts/BiometricsFingerprint.vts
+++ b/biometrics/fingerprint/2.1/vts/BiometricsFingerprint.vts
@@ -9,276 +9,6 @@ import: "android.hardware.biometrics.fingerprint@2.1::types"
9import: "android.hidl.base@1.0::types" 9import: "android.hidl.base@1.0::types"
10 10
11interface: { 11interface: {
12 attribute: {
13 name: "::android::hardware::biometrics::fingerprint::V2_1::RequestStatus"
14 type: TYPE_ENUM
15 enum_value: {
16 scalar_type: "int32_t"
17
18 enumerator: "SYS_UNKNOWN"
19 scalar_value: {
20 int32_t: 1
21 }
22 enumerator: "SYS_OK"
23 scalar_value: {
24 int32_t: 0
25 }
26 enumerator: "SYS_ENOENT"
27 scalar_value: {
28 int32_t: -2
29 }
30 enumerator: "SYS_EINTR"
31 scalar_value: {
32 int32_t: -4
33 }
34 enumerator: "SYS_EIO"
35 scalar_value: {
36 int32_t: -5
37 }
38 enumerator: "SYS_EAGAIN"
39 scalar_value: {
40 int32_t: -11
41 }
42 enumerator: "SYS_ENOMEM"
43 scalar_value: {
44 int32_t: -12
45 }
46 enumerator: "SYS_EACCES"
47 scalar_value: {
48 int32_t: -13
49 }
50 enumerator: "SYS_EFAULT"
51 scalar_value: {
52 int32_t: -14
53 }
54 enumerator: "SYS_EBUSY"
55 scalar_value: {
56 int32_t: -16
57 }
58 enumerator: "SYS_EINVAL"
59 scalar_value: {
60 int32_t: -22
61 }
62 enumerator: "SYS_ENOSPC"
63 scalar_value: {
64 int32_t: -28
65 }
66 enumerator: "SYS_ETIMEDOUT"
67 scalar_value: {
68 int32_t: -110
69 }
70 }
71 }
72
73 attribute: {
74 name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintError"
75 type: TYPE_ENUM
76 enum_value: {
77 scalar_type: "int32_t"
78
79 enumerator: "ERROR_NO_ERROR"
80 scalar_value: {
81 int32_t: 0
82 }
83 enumerator: "ERROR_HW_UNAVAILABLE"
84 scalar_value: {
85 int32_t: 1
86 }
87 enumerator: "ERROR_UNABLE_TO_PROCESS"
88 scalar_value: {
89 int32_t: 2
90 }
91 enumerator: "ERROR_TIMEOUT"
92 scalar_value: {
93 int32_t: 3
94 }
95 enumerator: "ERROR_NO_SPACE"
96 scalar_value: {
97 int32_t: 4
98 }
99 enumerator: "ERROR_CANCELED"
100 scalar_value: {
101 int32_t: 5
102 }
103 enumerator: "ERROR_UNABLE_TO_REMOVE"
104 scalar_value: {
105 int32_t: 6
106 }
107 enumerator: "ERROR_LOCKOUT"
108 scalar_value: {
109 int32_t: 7
110 }
111 enumerator: "ERROR_VENDOR"
112 scalar_value: {
113 int32_t: 8
114 }
115 }
116 }
117
118 attribute: {
119 name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquiredInfo"
120 type: TYPE_ENUM
121 enum_value: {
122 scalar_type: "int32_t"
123
124 enumerator: "ACQUIRED_GOOD"
125 scalar_value: {
126 int32_t: 0
127 }
128 enumerator: "ACQUIRED_PARTIAL"
129 scalar_value: {
130 int32_t: 1
131 }
132 enumerator: "ACQUIRED_INSUFFICIENT"
133 scalar_value: {
134 int32_t: 2
135 }
136 enumerator: "ACQUIRED_IMAGER_DIRTY"
137 scalar_value: {
138 int32_t: 3
139 }
140 enumerator: "ACQUIRED_TOO_SLOW"
141 scalar_value: {
142 int32_t: 4
143 }
144 enumerator: "ACQUIRED_TOO_FAST"
145 scalar_value: {
146 int32_t: 5
147 }
148 enumerator: "ACQUIRED_VENDOR"
149 scalar_value: {
150 int32_t: 6
151 }
152 }
153 }
154
155 attribute: {
156 name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
157 type: TYPE_STRUCT
158 struct_value: {
159 name: "gid"
160 type: TYPE_SCALAR
161 scalar_type: "uint32_t"
162 }
163 struct_value: {
164 name: "fid"
165 type: TYPE_SCALAR
166 scalar_type: "uint32_t"
167 }
168 }
169
170 attribute: {
171 name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintEnroll"
172 type: TYPE_STRUCT
173 struct_value: {
174 name: "finger"
175 type: TYPE_STRUCT
176 predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
177 }
178 struct_value: {
179 name: "samplesRemaining"
180 type: TYPE_SCALAR
181 scalar_type: "uint32_t"
182 }
183 struct_value: {
184 name: "msg"
185 type: TYPE_SCALAR
186 scalar_type: "uint64_t"
187 }
188 }
189
190 attribute: {
191 name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintIterator"
192 type: TYPE_STRUCT
193 struct_value: {
194 name: "finger"
195 type: TYPE_STRUCT
196 predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
197 }
198 struct_value: {
199 name: "remainingTemplates"
200 type: TYPE_SCALAR
201 scalar_type: "uint32_t"
202 }
203 }
204
205 attribute: {
206 name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquired"
207 type: TYPE_STRUCT
208 struct_value: {
209 name: "acquiredInfo"
210 type: TYPE_ENUM
211 predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquiredInfo"
212 }
213 }
214
215 attribute: {
216 name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAuthenticated"
217 type: TYPE_STRUCT
218 struct_value: {
219 name: "finger"
220 type: TYPE_STRUCT
221 predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
222 }
223 struct_value: {
224 name: "hat"
225 type: TYPE_ARRAY
226 vector_size: 69
227 vector_value: {
228 type: TYPE_SCALAR
229 scalar_type: "uint8_t"
230 }
231 }
232 }
233
234 attribute: {
235 name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintMsgType"
236 type: TYPE_ENUM
237 enum_value: {
238 scalar_type: "int32_t"
239
240 enumerator: "ERROR"
241 scalar_value: {
242 int32_t: -1
243 }
244 enumerator: "ACQUIRED"
245 scalar_value: {
246 int32_t: 1
247 }
248 enumerator: "TEMPLATE_ENROLLING"
249 scalar_value: {
250 int32_t: 3
251 }
252 enumerator: "TEMPLATE_REMOVED"
253 scalar_value: {
254 int32_t: 4
255 }
256 enumerator: "AUTHENTICATED"
257 scalar_value: {
258 int32_t: 5
259 }
260 enumerator: "TEMPLATE_ENUMERATING"
261 scalar_value: {
262 int32_t: 6
263 }
264 }
265 }
266
267 attribute: {
268 name: "::android::hidl::base::V1_0::DebugInfo"
269 type: TYPE_STRUCT
270 struct_value: {
271 name: "pid"
272 type: TYPE_SCALAR
273 scalar_type: "int32_t"
274 }
275 struct_value: {
276 name: "ptr"
277 type: TYPE_SCALAR
278 scalar_type: "uint64_t"
279 }
280 }
281
282 api: { 12 api: {
283 name: "setNotify" 13 name: "setNotify"
284 return_type_hidl: { 14 return_type_hidl: {
diff --git a/biometrics/fingerprint/2.1/vts/BiometricsFingerprintClientCallback.vts b/biometrics/fingerprint/2.1/vts/BiometricsFingerprintClientCallback.vts
index 7cf4003b..dedda65b 100644
--- a/biometrics/fingerprint/2.1/vts/BiometricsFingerprintClientCallback.vts
+++ b/biometrics/fingerprint/2.1/vts/BiometricsFingerprintClientCallback.vts
@@ -8,276 +8,6 @@ import: "android.hardware.biometrics.fingerprint@2.1::types"
8import: "android.hidl.base@1.0::types" 8import: "android.hidl.base@1.0::types"
9 9
10interface: { 10interface: {
11 attribute: {
12 name: "::android::hardware::biometrics::fingerprint::V2_1::RequestStatus"
13 type: TYPE_ENUM
14 enum_value: {
15 scalar_type: "int32_t"
16
17 enumerator: "SYS_UNKNOWN"
18 scalar_value: {
19 int32_t: 1
20 }
21 enumerator: "SYS_OK"
22 scalar_value: {
23 int32_t: 0
24 }
25 enumerator: "SYS_ENOENT"
26 scalar_value: {
27 int32_t: -2
28 }
29 enumerator: "SYS_EINTR"
30 scalar_value: {
31 int32_t: -4
32 }
33 enumerator: "SYS_EIO"
34 scalar_value: {
35 int32_t: -5
36 }
37 enumerator: "SYS_EAGAIN"
38 scalar_value: {
39 int32_t: -11
40 }
41 enumerator: "SYS_ENOMEM"
42 scalar_value: {
43 int32_t: -12
44 }
45 enumerator: "SYS_EACCES"
46 scalar_value: {
47 int32_t: -13
48 }
49 enumerator: "SYS_EFAULT"
50 scalar_value: {
51 int32_t: -14
52 }
53 enumerator: "SYS_EBUSY"
54 scalar_value: {
55 int32_t: -16
56 }
57 enumerator: "SYS_EINVAL"
58 scalar_value: {
59 int32_t: -22
60 }
61 enumerator: "SYS_ENOSPC"
62 scalar_value: {
63 int32_t: -28
64 }
65 enumerator: "SYS_ETIMEDOUT"
66 scalar_value: {
67 int32_t: -110
68 }
69 }
70 }
71
72 attribute: {
73 name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintError"
74 type: TYPE_ENUM
75 enum_value: {
76 scalar_type: "int32_t"
77
78 enumerator: "ERROR_NO_ERROR"
79 scalar_value: {
80 int32_t: 0
81 }
82 enumerator: "ERROR_HW_UNAVAILABLE"
83 scalar_value: {
84 int32_t: 1
85 }
86 enumerator: "ERROR_UNABLE_TO_PROCESS"
87 scalar_value: {
88 int32_t: 2
89 }
90 enumerator: "ERROR_TIMEOUT"
91 scalar_value: {
92 int32_t: 3
93 }
94 enumerator: "ERROR_NO_SPACE"
95 scalar_value: {
96 int32_t: 4
97 }
98 enumerator: "ERROR_CANCELED"
99 scalar_value: {
100 int32_t: 5
101 }
102 enumerator: "ERROR_UNABLE_TO_REMOVE"
103 scalar_value: {
104 int32_t: 6
105 }
106 enumerator: "ERROR_LOCKOUT"
107 scalar_value: {
108 int32_t: 7
109 }
110 enumerator: "ERROR_VENDOR"
111 scalar_value: {
112 int32_t: 8
113 }
114 }
115 }
116
117 attribute: {
118 name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquiredInfo"
119 type: TYPE_ENUM
120 enum_value: {
121 scalar_type: "int32_t"
122
123 enumerator: "ACQUIRED_GOOD"
124 scalar_value: {
125 int32_t: 0
126 }
127 enumerator: "ACQUIRED_PARTIAL"
128 scalar_value: {
129 int32_t: 1
130 }
131 enumerator: "ACQUIRED_INSUFFICIENT"
132 scalar_value: {
133 int32_t: 2
134 }
135 enumerator: "ACQUIRED_IMAGER_DIRTY"
136 scalar_value: {
137 int32_t: 3
138 }
139 enumerator: "ACQUIRED_TOO_SLOW"
140 scalar_value: {
141 int32_t: 4
142 }
143 enumerator: "ACQUIRED_TOO_FAST"
144 scalar_value: {
145 int32_t: 5
146 }
147 enumerator: "ACQUIRED_VENDOR"
148 scalar_value: {
149 int32_t: 6
150 }
151 }
152 }
153
154 attribute: {
155 name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
156 type: TYPE_STRUCT
157 struct_value: {
158 name: "gid"
159 type: TYPE_SCALAR
160 scalar_type: "uint32_t"
161 }
162 struct_value: {
163 name: "fid"
164 type: TYPE_SCALAR
165 scalar_type: "uint32_t"
166 }
167 }
168
169 attribute: {
170 name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintEnroll"
171 type: TYPE_STRUCT
172 struct_value: {
173 name: "finger"
174 type: TYPE_STRUCT
175 predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
176 }
177 struct_value: {
178 name: "samplesRemaining"
179 type: TYPE_SCALAR
180 scalar_type: "uint32_t"
181 }
182 struct_value: {
183 name: "msg"
184 type: TYPE_SCALAR
185 scalar_type: "uint64_t"
186 }
187 }
188
189 attribute: {
190 name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintIterator"
191 type: TYPE_STRUCT
192 struct_value: {
193 name: "finger"
194 type: TYPE_STRUCT
195 predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
196 }
197 struct_value: {
198 name: "remainingTemplates"
199 type: TYPE_SCALAR
200 scalar_type: "uint32_t"
201 }
202 }
203
204 attribute: {
205 name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquired"
206 type: TYPE_STRUCT
207 struct_value: {
208 name: "acquiredInfo"
209 type: TYPE_ENUM
210 predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquiredInfo"
211 }
212 }
213
214 attribute: {
215 name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAuthenticated"
216 type: TYPE_STRUCT
217 struct_value: {
218 name: "finger"
219 type: TYPE_STRUCT
220 predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
221 }
222 struct_value: {
223 name: "hat"
224 type: TYPE_ARRAY
225 vector_size: 69
226 vector_value: {
227 type: TYPE_SCALAR
228 scalar_type: "uint8_t"
229 }
230 }
231 }
232
233 attribute: {
234 name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintMsgType"
235 type: TYPE_ENUM
236 enum_value: {
237 scalar_type: "int32_t"
238
239 enumerator: "ERROR"
240 scalar_value: {
241 int32_t: -1
242 }
243 enumerator: "ACQUIRED"
244 scalar_value: {
245 int32_t: 1
246 }
247 enumerator: "TEMPLATE_ENROLLING"
248 scalar_value: {
249 int32_t: 3
250 }
251 enumerator: "TEMPLATE_REMOVED"
252 scalar_value: {
253 int32_t: 4
254 }
255 enumerator: "AUTHENTICATED"
256 scalar_value: {
257 int32_t: 5
258 }
259 enumerator: "TEMPLATE_ENUMERATING"
260 scalar_value: {
261 int32_t: 6
262 }
263 }
264 }
265
266 attribute: {
267 name: "::android::hidl::base::V1_0::DebugInfo"
268 type: TYPE_STRUCT
269 struct_value: {
270 name: "pid"
271 type: TYPE_SCALAR
272 scalar_type: "int32_t"
273 }
274 struct_value: {
275 name: "ptr"
276 type: TYPE_SCALAR
277 scalar_type: "uint64_t"
278 }
279 }
280
281 api: { 11 api: {
282 name: "onEnrollResult" 12 name: "onEnrollResult"
283 arg: { 13 arg: {
diff --git a/boot/1.0/vts/BootControl.vts b/boot/1.0/vts/BootControl.vts
index 384ae509..b400f0e9 100644
--- a/boot/1.0/vts/BootControl.vts
+++ b/boot/1.0/vts/BootControl.vts
@@ -5,6 +5,7 @@ component_name: "IBootControl"
5package: "android.hardware.boot" 5package: "android.hardware.boot"
6 6
7import: "android.hardware.boot@1.0::types" 7import: "android.hardware.boot@1.0::types"
8import: "android.hidl.base@1.0::types"
8 9
9interface: { 10interface: {
10 api: { 11 api: {
diff --git a/contexthub/1.0/vts/Contexthub.vts b/contexthub/1.0/vts/Contexthub.vts
index b06efe6d..a5cdc81f 100644
--- a/contexthub/1.0/vts/Contexthub.vts
+++ b/contexthub/1.0/vts/Contexthub.vts
@@ -9,491 +9,6 @@ import: "android.hardware.contexthub@1.0::types"
9import: "android.hidl.base@1.0::types" 9import: "android.hidl.base@1.0::types"
10 10
11interface: { 11interface: {
12 attribute: {
13 name: "::android::hardware::contexthub::V1_0::Result"
14 type: TYPE_ENUM
15 enum_value: {
16 scalar_type: "uint32_t"
17
18 enumerator: "OK"
19 scalar_value: {
20 uint32_t: 0
21 }
22 enumerator: "UNKNOWN_FAILURE"
23 scalar_value: {
24 uint32_t: 1
25 }
26 enumerator: "BAD_PARAMS"
27 scalar_value: {
28 uint32_t: 2
29 }
30 enumerator: "NOT_INIT"
31 scalar_value: {
32 uint32_t: 3
33 }
34 enumerator: "TRANSACTION_FAILED"
35 scalar_value: {
36 uint32_t: 4
37 }
38 enumerator: "TRANSACTION_PENDING"
39 scalar_value: {
40 uint32_t: 5
41 }
42 }
43 }
44
45 attribute: {
46 name: "::android::hardware::contexthub::V1_0::NanoAppFlags"
47 type: TYPE_ENUM
48 enum_value: {
49 scalar_type: "uint32_t"
50
51 enumerator: "SIGNED"
52 scalar_value: {
53 uint32_t: 1
54 }
55 enumerator: "ENCRYPTED"
56 scalar_value: {
57 uint32_t: 2
58 }
59 }
60 }
61
62 attribute: {
63 name: "::android::hardware::contexthub::V1_0::NanoAppBinary"
64 type: TYPE_STRUCT
65 struct_value: {
66 name: "appId"
67 type: TYPE_SCALAR
68 scalar_type: "uint64_t"
69 }
70 struct_value: {
71 name: "appVersion"
72 type: TYPE_SCALAR
73 scalar_type: "uint32_t"
74 }
75 struct_value: {
76 name: "flags"
77 type: TYPE_MASK
78 scalar_type: "uint32_t"
79 predefined_type: "::android::hardware::contexthub::V1_0::NanoAppFlags"
80 }
81 struct_value: {
82 name: "targetChreApiMajorVersion"
83 type: TYPE_SCALAR
84 scalar_type: "uint8_t"
85 }
86 struct_value: {
87 name: "targetChreApiMinorVersion"
88 type: TYPE_SCALAR
89 scalar_type: "uint8_t"
90 }
91 struct_value: {
92 name: "customBinary"
93 type: TYPE_VECTOR
94 vector_value: {
95 type: TYPE_SCALAR
96 scalar_type: "uint8_t"
97 }
98 }
99 }
100
101 attribute: {
102 name: "::android::hardware::contexthub::V1_0::SensorType"
103 type: TYPE_ENUM
104 enum_value: {
105 scalar_type: "uint32_t"
106
107 enumerator: "RESERVED"
108 scalar_value: {
109 uint32_t: 0
110 }
111 enumerator: "ACCELEROMETER"
112 scalar_value: {
113 uint32_t: 1
114 }
115 enumerator: "GYROSCOPE"
116 scalar_value: {
117 uint32_t: 2
118 }
119 enumerator: "MAGNETOMETER"
120 scalar_value: {
121 uint32_t: 3
122 }
123 enumerator: "BAROMETER"
124 scalar_value: {
125 uint32_t: 4
126 }
127 enumerator: "PROXIMITY_SENSOR"
128 scalar_value: {
129 uint32_t: 5
130 }
131 enumerator: "AMBIENT_LIGHT_SENSOR"
132 scalar_value: {
133 uint32_t: 6
134 }
135 enumerator: "STATIONARY_DETECT"
136 scalar_value: {
137 uint32_t: 7
138 }
139 enumerator: "INSTANT_MOTION_DETECT"
140 scalar_value: {
141 uint32_t: 8
142 }
143 enumerator: "GPS"
144 scalar_value: {
145 uint32_t: 256
146 }
147 enumerator: "WIFI"
148 scalar_value: {
149 uint32_t: 512
150 }
151 enumerator: "AUDIO"
152 scalar_value: {
153 uint32_t: 768
154 }
155 enumerator: "CAMERA"
156 scalar_value: {
157 uint32_t: 1024
158 }
159 enumerator: "BLE"
160 scalar_value: {
161 uint32_t: 1280
162 }
163 enumerator: "WWAN"
164 scalar_value: {
165 uint32_t: 1536
166 }
167 enumerator: "PRIVATE_SENSOR_BASE"
168 scalar_value: {
169 uint32_t: 65536
170 }
171 }
172 }
173
174 attribute: {
175 name: "::android::hardware::contexthub::V1_0::PhysicalSensor"
176 type: TYPE_STRUCT
177 struct_value: {
178 name: "sensorType"
179 type: TYPE_ENUM
180 predefined_type: "::android::hardware::contexthub::V1_0::SensorType"
181 }
182 struct_value: {
183 name: "type"
184 type: TYPE_STRING
185 }
186 struct_value: {
187 name: "name"
188 type: TYPE_STRING
189 }
190 struct_value: {
191 name: "vendor"
192 type: TYPE_STRING
193 }
194 struct_value: {
195 name: "version"
196 type: TYPE_SCALAR
197 scalar_type: "uint32_t"
198 }
199 struct_value: {
200 name: "fifoReservedCount"
201 type: TYPE_SCALAR
202 scalar_type: "uint32_t"
203 }
204 struct_value: {
205 name: "fifoMaxCount"
206 type: TYPE_SCALAR
207 scalar_type: "uint32_t"
208 }
209 struct_value: {
210 name: "minDelayMs"
211 type: TYPE_SCALAR
212 scalar_type: "uint64_t"
213 }
214 struct_value: {
215 name: "maxDelayMs"
216 type: TYPE_SCALAR
217 scalar_type: "uint64_t"
218 }
219 struct_value: {
220 name: "peakPowerMw"
221 type: TYPE_SCALAR
222 scalar_type: "float_t"
223 }
224 }
225
226 attribute: {
227 name: "::android::hardware::contexthub::V1_0::ContextHub"
228 type: TYPE_STRUCT
229 struct_value: {
230 name: "name"
231 type: TYPE_STRING
232 }
233 struct_value: {
234 name: "vendor"
235 type: TYPE_STRING
236 }
237 struct_value: {
238 name: "toolchain"
239 type: TYPE_STRING
240 }
241 struct_value: {
242 name: "platformVersion"
243 type: TYPE_SCALAR
244 scalar_type: "uint32_t"
245 }
246 struct_value: {
247 name: "toolchainVersion"
248 type: TYPE_SCALAR
249 scalar_type: "uint32_t"
250 }
251 struct_value: {
252 name: "hubId"
253 type: TYPE_SCALAR
254 scalar_type: "uint32_t"
255 }
256 struct_value: {
257 name: "peakMips"
258 type: TYPE_SCALAR
259 scalar_type: "float_t"
260 }
261 struct_value: {
262 name: "stoppedPowerDrawMw"
263 type: TYPE_SCALAR
264 scalar_type: "float_t"
265 }
266 struct_value: {
267 name: "sleepPowerDrawMw"
268 type: TYPE_SCALAR
269 scalar_type: "float_t"
270 }
271 struct_value: {
272 name: "peakPowerDrawMw"
273 type: TYPE_SCALAR
274 scalar_type: "float_t"
275 }
276 struct_value: {
277 name: "connectedSensors"
278 type: TYPE_VECTOR
279 vector_value: {
280 type: TYPE_STRUCT
281 predefined_type: "::android::hardware::contexthub::V1_0::PhysicalSensor"
282 }
283 }
284 struct_value: {
285 name: "maxSupportedMsgLen"
286 type: TYPE_SCALAR
287 scalar_type: "uint32_t"
288 }
289 struct_value: {
290 name: "chrePlatformId"
291 type: TYPE_SCALAR
292 scalar_type: "uint64_t"
293 }
294 struct_value: {
295 name: "chreApiMajorVersion"
296 type: TYPE_SCALAR
297 scalar_type: "uint8_t"
298 }
299 struct_value: {
300 name: "chreApiMinorVersion"
301 type: TYPE_SCALAR
302 scalar_type: "uint8_t"
303 }
304 struct_value: {
305 name: "chrePatchVersion"
306 type: TYPE_SCALAR
307 scalar_type: "uint16_t"
308 }
309 }
310
311 attribute: {
312 name: "::android::hardware::contexthub::V1_0::HostEndPoint"
313 type: TYPE_ENUM
314 enum_value: {
315 scalar_type: "uint16_t"
316
317 enumerator: "BROADCAST"
318 scalar_value: {
319 uint16_t: 65535
320 }
321 enumerator: "UNSPECIFIED"
322 scalar_value: {
323 uint16_t: 65534
324 }
325 }
326 }
327
328 attribute: {
329 name: "::android::hardware::contexthub::V1_0::ContextHubMsg"
330 type: TYPE_STRUCT
331 struct_value: {
332 name: "appName"
333 type: TYPE_SCALAR
334 scalar_type: "uint64_t"
335 }
336 struct_value: {
337 name: "hostEndPoint"
338 type: TYPE_SCALAR
339 scalar_type: "uint16_t"
340 }
341 struct_value: {
342 name: "msgType"
343 type: TYPE_SCALAR
344 scalar_type: "uint32_t"
345 }
346 struct_value: {
347 name: "msg"
348 type: TYPE_VECTOR
349 vector_value: {
350 type: TYPE_SCALAR
351 scalar_type: "uint8_t"
352 }
353 }
354 }
355
356 attribute: {
357 name: "::android::hardware::contexthub::V1_0::HubMemoryType"
358 type: TYPE_ENUM
359 enum_value: {
360 scalar_type: "uint32_t"
361
362 enumerator: "MAIN"
363 scalar_value: {
364 uint32_t: 0
365 }
366 enumerator: "SECONDARY"
367 scalar_value: {
368 uint32_t: 1
369 }
370 enumerator: "TCM"
371 scalar_value: {
372 uint32_t: 2
373 }
374 }
375 }
376
377 attribute: {
378 name: "::android::hardware::contexthub::V1_0::HubMemoryFlag"
379 type: TYPE_ENUM
380 enum_value: {
381 scalar_type: "uint32_t"
382
383 enumerator: "READ"
384 scalar_value: {
385 uint32_t: 1
386 }
387 enumerator: "WRITE"
388 scalar_value: {
389 uint32_t: 2
390 }
391 enumerator: "EXEC"
392 scalar_value: {
393 uint32_t: 4
394 }
395 }
396 }
397
398 attribute: {
399 name: "::android::hardware::contexthub::V1_0::MemRange"
400 type: TYPE_STRUCT
401 struct_value: {
402 name: "totalBytes"
403 type: TYPE_SCALAR
404 scalar_type: "uint32_t"
405 }
406 struct_value: {
407 name: "freeBytes"
408 type: TYPE_SCALAR
409 scalar_type: "uint32_t"
410 }
411 struct_value: {
412 name: "type"
413 type: TYPE_ENUM
414 predefined_type: "::android::hardware::contexthub::V1_0::HubMemoryType"
415 }
416 struct_value: {
417 name: "flags"
418 type: TYPE_MASK
419 scalar_type: "uint32_t"
420 predefined_type: "::android::hardware::contexthub::V1_0::HubMemoryFlag"
421 }
422 }
423
424 attribute: {
425 name: "::android::hardware::contexthub::V1_0::AsyncEventType"
426 type: TYPE_ENUM
427 enum_value: {
428 scalar_type: "uint32_t"
429
430 enumerator: "RESTARTED"
431 scalar_value: {
432 uint32_t: 1
433 }
434 }
435 }
436
437 attribute: {
438 name: "::android::hardware::contexthub::V1_0::TransactionResult"
439 type: TYPE_ENUM
440 enum_value: {
441 scalar_type: "int32_t"
442
443 enumerator: "SUCCESS"
444 scalar_value: {
445 int32_t: 0
446 }
447 enumerator: "FAILURE"
448 scalar_value: {
449 int32_t: 1
450 }
451 }
452 }
453
454 attribute: {
455 name: "::android::hardware::contexthub::V1_0::HubAppInfo"
456 type: TYPE_STRUCT
457 struct_value: {
458 name: "appId"
459 type: TYPE_SCALAR
460 scalar_type: "uint64_t"
461 }
462 struct_value: {
463 name: "version"
464 type: TYPE_SCALAR
465 scalar_type: "uint32_t"
466 }
467 struct_value: {
468 name: "memUsage"
469 type: TYPE_VECTOR
470 vector_value: {
471 type: TYPE_STRUCT
472 predefined_type: "::android::hardware::contexthub::V1_0::MemRange"
473 }
474 }
475 struct_value: {
476 name: "enabled"
477 type: TYPE_SCALAR
478 scalar_type: "bool_t"
479 }
480 }
481
482 attribute: {
483 name: "::android::hidl::base::V1_0::DebugInfo"
484 type: TYPE_STRUCT
485 struct_value: {
486 name: "pid"
487 type: TYPE_SCALAR
488 scalar_type: "int32_t"
489 }
490 struct_value: {
491 name: "ptr"
492 type: TYPE_SCALAR
493 scalar_type: "uint64_t"
494 }
495 }
496
497 api: { 12 api: {
498 name: "getHubs" 13 name: "getHubs"
499 return_type_hidl: { 14 return_type_hidl: {
diff --git a/contexthub/1.0/vts/ContexthubCallback.vts b/contexthub/1.0/vts/ContexthubCallback.vts
index 7897a839..59ff2feb 100644
--- a/contexthub/1.0/vts/ContexthubCallback.vts
+++ b/contexthub/1.0/vts/ContexthubCallback.vts
@@ -8,491 +8,6 @@ import: "android.hardware.contexthub@1.0::types"
8import: "android.hidl.base@1.0::types" 8import: "android.hidl.base@1.0::types"
9 9
10interface: { 10interface: {
11 attribute: {
12 name: "::android::hardware::contexthub::V1_0::Result"
13 type: TYPE_ENUM
14 enum_value: {
15 scalar_type: "uint32_t"
16
17 enumerator: "OK"
18 scalar_value: {
19 uint32_t: 0
20 }
21 enumerator: "UNKNOWN_FAILURE"
22 scalar_value: {
23 uint32_t: 1
24 }
25 enumerator: "BAD_PARAMS"
26 scalar_value: {
27 uint32_t: 2
28 }
29 enumerator: "NOT_INIT"
30 scalar_value: {
31 uint32_t: 3
32 }
33 enumerator: "TRANSACTION_FAILED"
34 scalar_value: {
35 uint32_t: 4
36 }
37 enumerator: "TRANSACTION_PENDING"
38 scalar_value: {
39 uint32_t: 5
40 }
41 }
42 }
43
44 attribute: {
45 name: "::android::hardware::contexthub::V1_0::NanoAppFlags"
46 type: TYPE_ENUM
47 enum_value: {
48 scalar_type: "uint32_t"
49
50 enumerator: "SIGNED"
51 scalar_value: {
52 uint32_t: 1
53 }
54 enumerator: "ENCRYPTED"
55 scalar_value: {
56 uint32_t: 2
57 }
58 }
59 }
60
61 attribute: {
62 name: "::android::hardware::contexthub::V1_0::NanoAppBinary"
63 type: TYPE_STRUCT
64 struct_value: {
65 name: "appId"
66 type: TYPE_SCALAR
67 scalar_type: "uint64_t"
68 }
69 struct_value: {
70 name: "appVersion"
71 type: TYPE_SCALAR
72 scalar_type: "uint32_t"
73 }
74 struct_value: {
75 name: "flags"
76 type: TYPE_MASK
77 scalar_type: "uint32_t"
78 predefined_type: "::android::hardware::contexthub::V1_0::NanoAppFlags"
79 }
80 struct_value: {
81 name: "targetChreApiMajorVersion"
82 type: TYPE_SCALAR
83 scalar_type: "uint8_t"
84 }
85 struct_value: {
86 name: "targetChreApiMinorVersion"
87 type: TYPE_SCALAR
88 scalar_type: "uint8_t"
89 }
90 struct_value: {
91 name: "customBinary"
92 type: TYPE_VECTOR
93 vector_value: {
94 type: TYPE_SCALAR
95 scalar_type: "uint8_t"
96 }
97 }
98 }
99
100 attribute: {
101 name: "::android::hardware::contexthub::V1_0::SensorType"
102 type: TYPE_ENUM
103 enum_value: {
104 scalar_type: "uint32_t"
105
106 enumerator: "RESERVED"
107 scalar_value: {
108 uint32_t: 0
109 }
110 enumerator: "ACCELEROMETER"
111 scalar_value: {
112 uint32_t: 1
113 }
114 enumerator: "GYROSCOPE"
115 scalar_value: {
116 uint32_t: 2
117 }
118 enumerator: "MAGNETOMETER"
119 scalar_value: {
120 uint32_t: 3
121 }
122 enumerator: "BAROMETER"
123 scalar_value: {
124 uint32_t: 4
125 }
126 enumerator: "PROXIMITY_SENSOR"
127 scalar_value: {
128 uint32_t: 5
129 }
130 enumerator: "AMBIENT_LIGHT_SENSOR"
131 scalar_value: {
132 uint32_t: 6
133 }
134 enumerator: "STATIONARY_DETECT"
135 scalar_value: {
136 uint32_t: 7
137 }
138 enumerator: "INSTANT_MOTION_DETECT"
139 scalar_value: {
140 uint32_t: 8
141 }
142 enumerator: "GPS"
143 scalar_value: {
144 uint32_t: 256
145 }
146 enumerator: "WIFI"
147 scalar_value: {
148 uint32_t: 512
149 }
150 enumerator: "AUDIO"
151 scalar_value: {
152 uint32_t: 768
153 }
154 enumerator: "CAMERA"
155 scalar_value: {
156 uint32_t: 1024
157 }
158 enumerator: "BLE"
159 scalar_value: {
160 uint32_t: 1280
161 }
162 enumerator: "WWAN"
163 scalar_value: {
164 uint32_t: 1536
165 }
166 enumerator: "PRIVATE_SENSOR_BASE"
167 scalar_value: {
168 uint32_t: 65536
169 }
170 }
171 }
172
173 attribute: {
174 name: "::android::hardware::contexthub::V1_0::PhysicalSensor"
175 type: TYPE_STRUCT
176 struct_value: {
177 name: "sensorType"
178 type: TYPE_ENUM
179 predefined_type: "::android::hardware::contexthub::V1_0::SensorType"
180 }
181 struct_value: {
182 name: "type"
183 type: TYPE_STRING
184 }
185 struct_value: {
186 name: "name"
187 type: TYPE_STRING
188 }
189 struct_value: {
190 name: "vendor"
191 type: TYPE_STRING
192 }
193 struct_value: {
194 name: "version"
195 type: TYPE_SCALAR
196 scalar_type: "uint32_t"
197 }
198 struct_value: {
199 name: "fifoReservedCount"
200 type: TYPE_SCALAR
201 scalar_type: "uint32_t"
202 }
203 struct_value: {
204 name: "fifoMaxCount"
205 type: TYPE_SCALAR
206 scalar_type: "uint32_t"
207 }
208 struct_value: {
209 name: "minDelayMs"
210 type: TYPE_SCALAR
211 scalar_type: "uint64_t"
212 }
213 struct_value: {
214 name: "maxDelayMs"
215 type: TYPE_SCALAR
216 scalar_type: "uint64_t"
217 }
218 struct_value: {
219 name: "peakPowerMw"
220 type: TYPE_SCALAR
221 scalar_type: "float_t"
222 }
223 }
224
225 attribute: {
226 name: "::android::hardware::contexthub::V1_0::ContextHub"
227 type: TYPE_STRUCT
228 struct_value: {
229 name: "name"
230 type: TYPE_STRING
231 }
232 struct_value: {
233 name: "vendor"
234 type: TYPE_STRING
235 }
236 struct_value: {
237 name: "toolchain"
238 type: TYPE_STRING
239 }
240 struct_value: {
241 name: "platformVersion"
242 type: TYPE_SCALAR
243 scalar_type: "uint32_t"
244 }
245 struct_value: {
246 name: "toolchainVersion"
247 type: TYPE_SCALAR
248 scalar_type: "uint32_t"
249 }
250 struct_value: {
251 name: "hubId"
252 type: TYPE_SCALAR
253 scalar_type: "uint32_t"
254 }
255 struct_value: {
256 name: "peakMips"
257 type: TYPE_SCALAR
258 scalar_type: "float_t"
259 }
260 struct_value: {
261 name: "stoppedPowerDrawMw"
262 type: TYPE_SCALAR
263 scalar_type: "float_t"
264 }
265 struct_value: {
266 name: "sleepPowerDrawMw"
267 type: TYPE_SCALAR
268 scalar_type: "float_t"
269 }
270 struct_value: {
271 name: "peakPowerDrawMw"
272 type: TYPE_SCALAR
273 scalar_type: "float_t"
274 }
275 struct_value: {
276 name: "connectedSensors"
277 type: TYPE_VECTOR
278 vector_value: {
279 type: TYPE_STRUCT
280 predefined_type: "::android::hardware::contexthub::V1_0::PhysicalSensor"
281 }
282 }
283 struct_value: {
284 name: "maxSupportedMsgLen"
285 type: TYPE_SCALAR
286 scalar_type: "uint32_t"
287 }
288 struct_value: {
289 name: "chrePlatformId"
290 type: TYPE_SCALAR
291 scalar_type: "uint64_t"
292 }
293 struct_value: {
294 name: "chreApiMajorVersion"
295 type: TYPE_SCALAR
296 scalar_type: "uint8_t"
297 }
298 struct_value: {
299 name: "chreApiMinorVersion"
300 type: TYPE_SCALAR
301 scalar_type: "uint8_t"
302 }
303 struct_value: {
304 name: "chrePatchVersion"
305 type: TYPE_SCALAR
306 scalar_type: "uint16_t"
307 }
308 }
309
310 attribute: {
311 name: "::android::hardware::contexthub::V1_0::HostEndPoint"
312 type: TYPE_ENUM
313 enum_value: {
314 scalar_type: "uint16_t"
315
316 enumerator: "BROADCAST"
317 scalar_value: {
318 uint16_t: 65535
319 }
320 enumerator: "UNSPECIFIED"
321 scalar_value: {
322 uint16_t: 65534
323 }
324 }
325 }
326
327 attribute: {
328 name: "::android::hardware::contexthub::V1_0::ContextHubMsg"
329 type: TYPE_STRUCT
330 struct_value: {
331 name: "appName"
332 type: TYPE_SCALAR
333 scalar_type: "uint64_t"
334 }
335 struct_value: {
336 name: "hostEndPoint"
337 type: TYPE_SCALAR
338 scalar_type: "uint16_t"
339 }
340 struct_value: {
341 name: "msgType"
342 type: TYPE_SCALAR
343 scalar_type: "uint32_t"
344 }
345 struct_value: {
346 name: "msg"
347 type: TYPE_VECTOR
348 vector_value: {
349 type: TYPE_SCALAR
350 scalar_type: "uint8_t"
351 }
352 }
353 }
354
355 attribute: {
356 name: "::android::hardware::contexthub::V1_0::HubMemoryType"
357 type: TYPE_ENUM
358 enum_value: {
359 scalar_type: "uint32_t"
360
361 enumerator: "MAIN"
362 scalar_value: {
363 uint32_t: 0
364 }
365 enumerator: "SECONDARY"
366 scalar_value: {
367 uint32_t: 1
368 }
369 enumerator: "TCM"
370 scalar_value: {
371 uint32_t: 2
372 }
373 }
374 }
375
376 attribute: {
377 name: "::android::hardware::contexthub::V1_0::HubMemoryFlag"
378 type: TYPE_ENUM
379 enum_value: {
380 scalar_type: "uint32_t"
381
382 enumerator: "READ"
383 scalar_value: {
384 uint32_t: 1
385 }
386 enumerator: "WRITE"
387 scalar_value: {
388 uint32_t: 2
389 }
390 enumerator: "EXEC"
391 scalar_value: {
392 uint32_t: 4
393 }
394 }
395 }
396
397 attribute: {
398 name: "::android::hardware::contexthub::V1_0::MemRange"
399 type: TYPE_STRUCT
400 struct_value: {
401 name: "totalBytes"
402 type: TYPE_SCALAR
403 scalar_type: "uint32_t"
404 }
405 struct_value: {
406 name: "freeBytes"
407 type: TYPE_SCALAR
408 scalar_type: "uint32_t"
409 }
410 struct_value: {
411 name: "type"
412 type: TYPE_ENUM
413 predefined_type: "::android::hardware::contexthub::V1_0::HubMemoryType"
414 }
415 struct_value: {
416 name: "flags"
417 type: TYPE_MASK
418 scalar_type: "uint32_t"
419 predefined_type: "::android::hardware::contexthub::V1_0::HubMemoryFlag"
420 }
421 }
422
423 attribute: {
424 name: "::android::hardware::contexthub::V1_0::AsyncEventType"
425 type: TYPE_ENUM
426 enum_value: {
427 scalar_type: "uint32_t"
428
429 enumerator: "RESTARTED"
430 scalar_value: {
431 uint32_t: 1
432 }
433 }
434 }
435
436 attribute: {
437 name: "::android::hardware::contexthub::V1_0::TransactionResult"
438 type: TYPE_ENUM
439 enum_value: {
440 scalar_type: "int32_t"
441
442 enumerator: "SUCCESS"
443 scalar_value: {
444 int32_t: 0
445 }
446 enumerator: "FAILURE"
447 scalar_value: {
448 int32_t: 1
449 }
450 }
451 }
452
453 attribute: {
454 name: "::android::hardware::contexthub::V1_0::HubAppInfo"
455 type: TYPE_STRUCT
456 struct_value: {
457 name: "appId"
458 type: TYPE_SCALAR
459 scalar_type: "uint64_t"
460 }
461 struct_value: {
462 name: "version"
463 type: TYPE_SCALAR
464 scalar_type: "uint32_t"
465 }
466 struct_value: {
467 name: "memUsage"
468 type: TYPE_VECTOR
469 vector_value: {
470 type: TYPE_STRUCT
471 predefined_type: "::android::hardware::contexthub::V1_0::MemRange"
472 }
473 }
474 struct_value: {
475 name: "enabled"
476 type: TYPE_SCALAR
477 scalar_type: "bool_t"
478 }
479 }
480
481 attribute: {
482 name: "::android::hidl::base::V1_0::DebugInfo"
483 type: TYPE_STRUCT
484 struct_value: {
485 name: "pid"
486 type: TYPE_SCALAR
487 scalar_type: "int32_t"
488 }
489 struct_value: {
490 name: "ptr"
491 type: TYPE_SCALAR
492 scalar_type: "uint64_t"
493 }
494 }
495
496 api: { 11 api: {
497 name: "handleClientMsg" 12 name: "handleClientMsg"
498 arg: { 13 arg: {
diff --git a/gatekeeper/1.0/vts/Gatekeeper.vts b/gatekeeper/1.0/vts/Gatekeeper.vts
index 25dc32f2..9e634883 100644
--- a/gatekeeper/1.0/vts/Gatekeeper.vts
+++ b/gatekeeper/1.0/vts/Gatekeeper.vts
@@ -5,6 +5,7 @@ component_name: "IGatekeeper"
5package: "android.hardware.gatekeeper" 5package: "android.hardware.gatekeeper"
6 6
7import: "android.hardware.gatekeeper@1.0::types" 7import: "android.hardware.gatekeeper@1.0::types"
8import: "android.hidl.base@1.0::types"
8 9
9interface: { 10interface: {
10 api: { 11 api: {
diff --git a/graphics/allocator/2.0/vts/Allocator.vts b/graphics/allocator/2.0/vts/Allocator.vts
index e767cbd5..b26876dd 100644
--- a/graphics/allocator/2.0/vts/Allocator.vts
+++ b/graphics/allocator/2.0/vts/Allocator.vts
@@ -6,6 +6,8 @@ package: "android.hardware.graphics.allocator"
6 6
7import: "android.hardware.graphics.allocator@2.0::IAllocatorClient" 7import: "android.hardware.graphics.allocator@2.0::IAllocatorClient"
8import: "android.hardware.graphics.allocator@2.0::types" 8import: "android.hardware.graphics.allocator@2.0::types"
9import: "android.hardware.graphics.common@1.0::types"
10import: "android.hidl.base@1.0::types"
9 11
10interface: { 12interface: {
11 attribute: { 13 attribute: {
@@ -73,8 +75,7 @@ interface: {
73 } 75 }
74 return_type_hidl: { 76 return_type_hidl: {
75 type: TYPE_HIDL_INTERFACE 77 type: TYPE_HIDL_INTERFACE
76 predefined_type: "IAllocatorClient" 78 predefined_type: "::android::hardware::graphics::allocator::V2_0::IAllocatorClient"
77 is_callback: false
78 } 79 }
79 callflow: { 80 callflow: {
80 entry: true 81 entry: true
diff --git a/graphics/allocator/2.0/vts/AllocatorClient.vts b/graphics/allocator/2.0/vts/AllocatorClient.vts
index 2ab19f7d..585c36c0 100644
--- a/graphics/allocator/2.0/vts/AllocatorClient.vts
+++ b/graphics/allocator/2.0/vts/AllocatorClient.vts
@@ -6,475 +6,10 @@ package: "android.hardware.graphics.allocator"
6 6
7import: "android.hardware.graphics.allocator@2.0::types" 7import: "android.hardware.graphics.allocator@2.0::types"
8import: "android.hardware.graphics.common@1.0::types" 8import: "android.hardware.graphics.common@1.0::types"
9import: "android.hidl.base@1.0::types"
9 10
10interface: { 11interface: {
11 attribute: { 12 attribute: {
12 name: "::android::hardware::graphics::common::V1_0::PixelFormat"
13 type: TYPE_ENUM
14 enum_value: {
15 scalar_type: "int32_t"
16
17 enumerator: "RGBA_8888"
18 scalar_value: {
19 int32_t: 1
20 }
21 enumerator: "RGBX_8888"
22 scalar_value: {
23 int32_t: 2
24 }
25 enumerator: "RGB_888"
26 scalar_value: {
27 int32_t: 3
28 }
29 enumerator: "RGB_565"
30 scalar_value: {
31 int32_t: 4
32 }
33 enumerator: "BGRA_8888"
34 scalar_value: {
35 int32_t: 5
36 }
37 enumerator: "RGBA_FP16"
38 scalar_value: {
39 int32_t: 22
40 }
41 enumerator: "YV12"
42 scalar_value: {
43 int32_t: 842094169
44 }
45 enumerator: "Y8"
46 scalar_value: {
47 int32_t: 538982489
48 }
49 enumerator: "Y16"
50 scalar_value: {
51 int32_t: 540422489
52 }
53 enumerator: "RAW16"
54 scalar_value: {
55 int32_t: 32
56 }
57 enumerator: "RAW10"
58 scalar_value: {
59 int32_t: 37
60 }
61 enumerator: "RAW12"
62 scalar_value: {
63 int32_t: 38
64 }
65 enumerator: "RAW_OPAQUE"
66 scalar_value: {
67 int32_t: 36
68 }
69 enumerator: "BLOB"
70 scalar_value: {
71 int32_t: 33
72 }
73 enumerator: "IMPLEMENTATION_DEFINED"
74 scalar_value: {
75 int32_t: 34
76 }
77 enumerator: "YCBCR_420_888"
78 scalar_value: {
79 int32_t: 35
80 }
81 enumerator: "YCBCR_422_888"
82 scalar_value: {
83 int32_t: 39
84 }
85 enumerator: "YCBCR_444_888"
86 scalar_value: {
87 int32_t: 40
88 }
89 enumerator: "FLEX_RGB_888"
90 scalar_value: {
91 int32_t: 41
92 }
93 enumerator: "FLEX_RGBA_8888"
94 scalar_value: {
95 int32_t: 42
96 }
97 enumerator: "YCBCR_422_SP"
98 scalar_value: {
99 int32_t: 16
100 }
101 enumerator: "YCRCB_420_SP"
102 scalar_value: {
103 int32_t: 17
104 }
105 enumerator: "YCBCR_422_I"
106 scalar_value: {
107 int32_t: 20
108 }
109 enumerator: "JPEG"
110 scalar_value: {
111 int32_t: 256
112 }
113 }
114 }
115
116 attribute: {
117 name: "::android::hardware::graphics::common::V1_0::Transform"
118 type: TYPE_ENUM
119 enum_value: {
120 scalar_type: "int32_t"
121
122 enumerator: "FLIP_H"
123 scalar_value: {
124 int32_t: 1
125 }
126 enumerator: "FLIP_V"
127 scalar_value: {
128 int32_t: 2
129 }
130 enumerator: "ROT_90"
131 scalar_value: {
132 int32_t: 4
133 }
134 enumerator: "ROT_180"
135 scalar_value: {
136 int32_t: 3
137 }
138 enumerator: "ROT_270"
139 scalar_value: {
140 int32_t: 7
141 }
142 }
143 }
144
145 attribute: {
146 name: "::android::hardware::graphics::common::V1_0::Dataspace"
147 type: TYPE_ENUM
148 enum_value: {
149 scalar_type: "int32_t"
150
151 enumerator: "UNKNOWN"
152 scalar_value: {
153 int32_t: 0
154 }
155 enumerator: "ARBITRARY"
156 scalar_value: {
157 int32_t: 1
158 }
159 enumerator: "STANDARD_SHIFT"
160 scalar_value: {
161 int32_t: 16
162 }
163 enumerator: "STANDARD_MASK"
164 scalar_value: {
165 int32_t: 4128768
166 }
167 enumerator: "STANDARD_UNSPECIFIED"
168 scalar_value: {
169 int32_t: 0
170 }
171 enumerator: "STANDARD_BT709"
172 scalar_value: {
173 int32_t: 65536
174 }
175 enumerator: "STANDARD_BT601_625"
176 scalar_value: {
177 int32_t: 131072
178 }
179 enumerator: "STANDARD_BT601_625_UNADJUSTED"
180 scalar_value: {
181 int32_t: 196608
182 }
183 enumerator: "STANDARD_BT601_525"
184 scalar_value: {
185 int32_t: 262144
186 }
187 enumerator: "STANDARD_BT601_525_UNADJUSTED"
188 scalar_value: {
189 int32_t: 327680
190 }
191 enumerator: "STANDARD_BT2020"
192 scalar_value: {
193 int32_t: 393216
194 }
195 enumerator: "STANDARD_BT2020_CONSTANT_LUMINANCE"
196 scalar_value: {
197 int32_t: 458752
198 }
199 enumerator: "STANDARD_BT470M"
200 scalar_value: {
201 int32_t: 524288
202 }
203 enumerator: "STANDARD_FILM"
204 scalar_value: {
205 int32_t: 589824
206 }
207 enumerator: "STANDARD_DCI_P3"
208 scalar_value: {
209 int32_t: 655360
210 }
211 enumerator: "STANDARD_ADOBE_RGB"
212 scalar_value: {
213 int32_t: 720896
214 }
215 enumerator: "TRANSFER_SHIFT"
216 scalar_value: {
217 int32_t: 22
218 }
219 enumerator: "TRANSFER_MASK"
220 scalar_value: {
221 int32_t: 130023424
222 }
223 enumerator: "TRANSFER_UNSPECIFIED"
224 scalar_value: {
225 int32_t: 0
226 }
227 enumerator: "TRANSFER_LINEAR"
228 scalar_value: {
229 int32_t: 4194304
230 }
231 enumerator: "TRANSFER_SRGB"
232 scalar_value: {
233 int32_t: 8388608
234 }
235 enumerator: "TRANSFER_SMPTE_170M"
236 scalar_value: {
237 int32_t: 12582912
238 }
239 enumerator: "TRANSFER_GAMMA2_2"
240 scalar_value: {
241 int32_t: 16777216
242 }
243 enumerator: "TRANSFER_GAMMA2_6"
244 scalar_value: {
245 int32_t: 20971520
246 }
247 enumerator: "TRANSFER_GAMMA2_8"
248 scalar_value: {
249 int32_t: 25165824
250 }
251 enumerator: "TRANSFER_ST2084"
252 scalar_value: {
253 int32_t: 29360128
254 }
255 enumerator: "TRANSFER_HLG"
256 scalar_value: {
257 int32_t: 33554432
258 }
259 enumerator: "RANGE_SHIFT"
260 scalar_value: {
261 int32_t: 27
262 }
263 enumerator: "RANGE_MASK"
264 scalar_value: {
265 int32_t: 939524096
266 }
267 enumerator: "RANGE_UNSPECIFIED"
268 scalar_value: {
269 int32_t: 0
270 }
271 enumerator: "RANGE_FULL"
272 scalar_value: {
273 int32_t: 134217728
274 }
275 enumerator: "RANGE_LIMITED"
276 scalar_value: {
277 int32_t: 268435456
278 }
279 enumerator: "RANGE_EXTENDED"
280 scalar_value: {
281 int32_t: 402653184
282 }
283 enumerator: "SRGB_LINEAR"
284 scalar_value: {
285 int32_t: 512
286 }
287 enumerator: "V0_SRGB_LINEAR"
288 scalar_value: {
289 int32_t: 138477568
290 }
291 enumerator: "V0_SCRGB_LINEAR"
292 scalar_value: {
293 int32_t: 406913024
294 }
295 enumerator: "SRGB"
296 scalar_value: {
297 int32_t: 513
298 }
299 enumerator: "V0_SRGB"
300 scalar_value: {
301 int32_t: 142671872
302 }
303 enumerator: "V0_SCRGB"
304 scalar_value: {
305 int32_t: 411107328
306 }
307 enumerator: "JFIF"
308 scalar_value: {
309 int32_t: 257
310 }
311 enumerator: "V0_JFIF"
312 scalar_value: {
313 int32_t: 146931712
314 }
315 enumerator: "BT601_625"
316 scalar_value: {
317 int32_t: 258
318 }
319 enumerator: "V0_BT601_625"
320 scalar_value: {
321 int32_t: 281149440
322 }
323 enumerator: "BT601_525"
324 scalar_value: {
325 int32_t: 259
326 }
327 enumerator: "V0_BT601_525"
328 scalar_value: {
329 int32_t: 281280512
330 }
331 enumerator: "BT709"
332 scalar_value: {
333 int32_t: 260
334 }
335 enumerator: "V0_BT709"
336 scalar_value: {
337 int32_t: 281083904
338 }
339 enumerator: "DCI_P3_LINEAR"
340 scalar_value: {
341 int32_t: 139067392
342 }
343 enumerator: "DCI_P3"
344 scalar_value: {
345 int32_t: 155844608
346 }
347 enumerator: "DISPLAY_P3_LINEAR"
348 scalar_value: {
349 int32_t: 139067392
350 }
351 enumerator: "DISPLAY_P3"
352 scalar_value: {
353 int32_t: 143261696
354 }
355 enumerator: "ADOBE_RGB"
356 scalar_value: {
357 int32_t: 151715840
358 }
359 enumerator: "BT2020_LINEAR"
360 scalar_value: {
361 int32_t: 138805248
362 }
363 enumerator: "BT2020"
364 scalar_value: {
365 int32_t: 147193856
366 }
367 enumerator: "DEPTH"
368 scalar_value: {
369 int32_t: 4096
370 }
371 }
372 }
373
374 attribute: {
375 name: "::android::hardware::graphics::common::V1_0::ColorMode"
376 type: TYPE_ENUM
377 enum_value: {
378 scalar_type: "int32_t"
379
380 enumerator: "NATIVE"
381 scalar_value: {
382 int32_t: 0
383 }
384 enumerator: "STANDARD_BT601_625"
385 scalar_value: {
386 int32_t: 1
387 }
388 enumerator: "STANDARD_BT601_625_UNADJUSTED"
389 scalar_value: {
390 int32_t: 2
391 }
392 enumerator: "STANDARD_BT601_525"
393 scalar_value: {
394 int32_t: 3
395 }
396 enumerator: "STANDARD_BT601_525_UNADJUSTED"
397 scalar_value: {
398 int32_t: 4
399 }
400 enumerator: "STANDARD_BT709"
401 scalar_value: {
402 int32_t: 5
403 }
404 enumerator: "DCI_P3"
405 scalar_value: {
406 int32_t: 6
407 }
408 enumerator: "SRGB"
409 scalar_value: {
410 int32_t: 7
411 }
412 enumerator: "ADOBE_RGB"
413 scalar_value: {
414 int32_t: 8
415 }
416 }
417 }
418
419 attribute: {
420 name: "::android::hardware::graphics::common::V1_0::ColorTransform"
421 type: TYPE_ENUM
422 enum_value: {
423 scalar_type: "int32_t"
424
425 enumerator: "IDENTITY"
426 scalar_value: {
427 int32_t: 0
428 }
429 enumerator: "ARBITRARY_MATRIX"
430 scalar_value: {
431 int32_t: 1
432 }
433 enumerator: "VALUE_INVERSE"
434 scalar_value: {
435 int32_t: 2
436 }
437 enumerator: "GRAYSCALE"
438 scalar_value: {
439 int32_t: 3
440 }
441 enumerator: "CORRECT_PROTANOPIA"
442 scalar_value: {
443 int32_t: 4
444 }
445 enumerator: "CORRECT_DEUTERANOPIA"
446 scalar_value: {
447 int32_t: 5
448 }
449 enumerator: "CORRECT_TRITANOPIA"
450 scalar_value: {
451 int32_t: 6
452 }
453 }
454 }
455
456 attribute: {
457 name: "::android::hardware::graphics::common::V1_0::Hdr"
458 type: TYPE_ENUM
459 enum_value: {
460 scalar_type: "int32_t"
461
462 enumerator: "DOLBY_VISION"
463 scalar_value: {
464 int32_t: 1
465 }
466 enumerator: "HDR10"
467 scalar_value: {
468 int32_t: 2
469 }
470 enumerator: "HLG"
471 scalar_value: {
472 int32_t: 3
473 }
474 }
475 }
476
477 attribute: {
478 name: "::android::hardware::graphics::allocator::V2_0::IAllocatorClient::BufferDescriptorInfo" 13 name: "::android::hardware::graphics::allocator::V2_0::IAllocatorClient::BufferDescriptorInfo"
479 type: TYPE_STRUCT 14 type: TYPE_STRUCT
480 struct_value: { 15 struct_value: {
diff --git a/graphics/allocator/2.0/vts/types.vts b/graphics/allocator/2.0/vts/types.vts
index 2b7e47a2..4a8376ca 100644
--- a/graphics/allocator/2.0/vts/types.vts
+++ b/graphics/allocator/2.0/vts/types.vts
@@ -84,6 +84,10 @@ attribute: {
84 scalar_value: { 84 scalar_value: {
85 uint64_t: 4194304 85 uint64_t: 4194304
86 } 86 }
87 enumerator: "SENSOR_DIRECT_DATA"
88 scalar_value: {
89 uint64_t: 8388608
90 }
87 } 91 }
88} 92}
89 93
@@ -129,6 +133,10 @@ attribute: {
129 scalar_value: { 133 scalar_value: {
130 uint64_t: 1048576 134 uint64_t: 1048576
131 } 135 }
136 enumerator: "GPU_DATA_BUFFER"
137 scalar_value: {
138 uint64_t: 8388608
139 }
132 } 140 }
133} 141}
134 142
diff --git a/graphics/composer/2.1/vts/Composer.vts b/graphics/composer/2.1/vts/Composer.vts
index ee5c650a..e60e39c5 100644
--- a/graphics/composer/2.1/vts/Composer.vts
+++ b/graphics/composer/2.1/vts/Composer.vts
@@ -4,8 +4,11 @@ component_name: "IComposer"
4 4
5package: "android.hardware.graphics.composer" 5package: "android.hardware.graphics.composer"
6 6
7import: "android.hardware.graphics.common@1.0::types"
8import: "android.hardware.graphics.composer@2.1::IComposerCallback"
7import: "android.hardware.graphics.composer@2.1::IComposerClient" 9import: "android.hardware.graphics.composer@2.1::IComposerClient"
8import: "android.hardware.graphics.composer@2.1::types" 10import: "android.hardware.graphics.composer@2.1::types"
11import: "android.hidl.base@1.0::types"
9 12
10interface: { 13interface: {
11 attribute: { 14 attribute: {
@@ -73,8 +76,7 @@ interface: {
73 } 76 }
74 return_type_hidl: { 77 return_type_hidl: {
75 type: TYPE_HIDL_INTERFACE 78 type: TYPE_HIDL_INTERFACE
76 predefined_type: "IComposerClient" 79 predefined_type: "::android::hardware::graphics::composer::V2_1::IComposerClient"
77 is_callback: false
78 } 80 }
79 callflow: { 81 callflow: {
80 entry: true 82 entry: true
diff --git a/graphics/composer/2.1/vts/ComposerCallback.vts b/graphics/composer/2.1/vts/ComposerCallback.vts
index a5a2aa9f..b83cf947 100644
--- a/graphics/composer/2.1/vts/ComposerCallback.vts
+++ b/graphics/composer/2.1/vts/ComposerCallback.vts
@@ -5,6 +5,7 @@ component_name: "IComposerCallback"
5package: "android.hardware.graphics.composer" 5package: "android.hardware.graphics.composer"
6 6
7import: "android.hardware.graphics.composer@2.1::types" 7import: "android.hardware.graphics.composer@2.1::types"
8import: "android.hidl.base@1.0::types"
8 9
9interface: { 10interface: {
10 attribute: { 11 attribute: {
diff --git a/graphics/composer/2.1/vts/ComposerClient.vts b/graphics/composer/2.1/vts/ComposerClient.vts
index db6b1ff7..ac1d7fb0 100644
--- a/graphics/composer/2.1/vts/ComposerClient.vts
+++ b/graphics/composer/2.1/vts/ComposerClient.vts
@@ -7,6 +7,7 @@ package: "android.hardware.graphics.composer"
7import: "android.hardware.graphics.common@1.0::types" 7import: "android.hardware.graphics.common@1.0::types"
8import: "android.hardware.graphics.composer@2.1::IComposerCallback" 8import: "android.hardware.graphics.composer@2.1::IComposerCallback"
9import: "android.hardware.graphics.composer@2.1::types" 9import: "android.hardware.graphics.composer@2.1::types"
10import: "android.hidl.base@1.0::types"
10 11
11interface: { 12interface: {
12 attribute: { 13 attribute: {
@@ -422,8 +423,7 @@ interface: {
422 name: "registerCallback" 423 name: "registerCallback"
423 arg: { 424 arg: {
424 type: TYPE_HIDL_CALLBACK 425 type: TYPE_HIDL_CALLBACK
425 predefined_type: "IComposerCallback" 426 predefined_type: "::android::hardware::graphics::composer::V2_1::IComposerCallback"
426 is_callback: true
427 } 427 }
428 callflow: { 428 callflow: {
429 entry: true 429 entry: true
@@ -849,6 +849,11 @@ interface: {
849 predefined_type: "::android::hardware::graphics::composer::V2_1::Error" 849 predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
850 } 850 }
851 arg: { 851 arg: {
852 type: TYPE_FMQ_SYNC
853 fmq_value: {
854 type: TYPE_SCALAR
855 scalar_type: "uint32_t"
856 }
852 } 857 }
853 callflow: { 858 callflow: {
854 next: "*" 859 next: "*"
@@ -862,6 +867,11 @@ interface: {
862 predefined_type: "::android::hardware::graphics::composer::V2_1::Error" 867 predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
863 } 868 }
864 return_type_hidl: { 869 return_type_hidl: {
870 type: TYPE_FMQ_SYNC
871 fmq_value: {
872 type: TYPE_SCALAR
873 scalar_type: "uint32_t"
874 }
865 } 875 }
866 callflow: { 876 callflow: {
867 next: "*" 877 next: "*"
diff --git a/graphics/mapper/2.0/vts/Mapper.vts b/graphics/mapper/2.0/vts/Mapper.vts
index 26e049f7..baf95dc1 100644
--- a/graphics/mapper/2.0/vts/Mapper.vts
+++ b/graphics/mapper/2.0/vts/Mapper.vts
@@ -7,6 +7,7 @@ package: "android.hardware.graphics.mapper"
7import: "android.hardware.graphics.allocator@2.0::types" 7import: "android.hardware.graphics.allocator@2.0::types"
8import: "android.hardware.graphics.common@1.0::types" 8import: "android.hardware.graphics.common@1.0::types"
9import: "android.hardware.graphics.mapper@2.0::types" 9import: "android.hardware.graphics.mapper@2.0::types"
10import: "android.hidl.base@1.0::types"
10 11
11interface: { 12interface: {
12 attribute: { 13 attribute: {
diff --git a/light/2.0/vts/Light.vts b/light/2.0/vts/Light.vts
index 5d49822c..163405fe 100644
--- a/light/2.0/vts/Light.vts
+++ b/light/2.0/vts/Light.vts
@@ -5,6 +5,7 @@ component_name: "ILight"
5package: "android.hardware.light" 5package: "android.hardware.light"
6 6
7import: "android.hardware.light@2.0::types" 7import: "android.hardware.light@2.0::types"
8import: "android.hidl.base@1.0::types"
8 9
9interface: { 10interface: {
10 api: { 11 api: {
diff --git a/memtrack/1.0/vts/Memtrack.vts b/memtrack/1.0/vts/Memtrack.vts
index 9fce2a02..42a422e4 100644
--- a/memtrack/1.0/vts/Memtrack.vts
+++ b/memtrack/1.0/vts/Memtrack.vts
@@ -5,6 +5,7 @@ component_name: "IMemtrack"
5package: "android.hardware.memtrack" 5package: "android.hardware.memtrack"
6 6
7import: "android.hardware.memtrack@1.0::types" 7import: "android.hardware.memtrack@1.0::types"
8import: "android.hidl.base@1.0::types"
8 9
9interface: { 10interface: {
10 api: { 11 api: {
diff --git a/power/1.0/vts/Power.vts b/power/1.0/vts/Power.vts
index 1711290e..4d3d4ffb 100644
--- a/power/1.0/vts/Power.vts
+++ b/power/1.0/vts/Power.vts
@@ -5,6 +5,7 @@ component_name: "IPower"
5package: "android.hardware.power" 5package: "android.hardware.power"
6 6
7import: "android.hardware.power@1.0::types" 7import: "android.hardware.power@1.0::types"
8import: "android.hidl.base@1.0::types"
8 9
9interface: { 10interface: {
10 api: { 11 api: {
diff --git a/radio/1.0/vts/RadioResponse.vts b/radio/1.0/vts/RadioResponse.vts
index 99c953c6..3d1364bb 100644
--- a/radio/1.0/vts/RadioResponse.vts
+++ b/radio/1.0/vts/RadioResponse.vts
@@ -1014,6 +1014,14 @@ interface: {
1014 } 1014 }
1015 1015
1016 api: { 1016 api: {
1017 name: "reportStkServiceIsRunningResponse"
1018 arg: {
1019 type: TYPE_STRUCT
1020 predefined_type: "::android::hardware::radio::V1_0::RadioResponseInfo"
1021 }
1022 }
1023
1024 api: {
1017 name: "getCdmaSubscriptionSourceResponse" 1025 name: "getCdmaSubscriptionSourceResponse"
1018 arg: { 1026 arg: {
1019 type: TYPE_STRUCT 1027 type: TYPE_STRUCT
diff --git a/sensors/1.0/vts/Sensors.vts b/sensors/1.0/vts/Sensors.vts
index 9e90755a..558c36df 100644
--- a/sensors/1.0/vts/Sensors.vts
+++ b/sensors/1.0/vts/Sensors.vts
@@ -5,6 +5,7 @@ component_name: "ISensors"
5package: "android.hardware.sensors" 5package: "android.hardware.sensors"
6 6
7import: "android.hardware.sensors@1.0::types" 7import: "android.hardware.sensors@1.0::types"
8import: "android.hidl.base@1.0::types"
8 9
9interface: { 10interface: {
10 api: { 11 api: {
diff --git a/sensors/1.0/vts/types.vts b/sensors/1.0/vts/types.vts
index 1b489168..bc878235 100644
--- a/sensors/1.0/vts/types.vts
+++ b/sensors/1.0/vts/types.vts
@@ -374,6 +374,7 @@ attribute: {
374 struct_value: { 374 struct_value: {
375 name: "flags" 375 name: "flags"
376 type: TYPE_MASK 376 type: TYPE_MASK
377 scalar_type: "uint32_t"
377 predefined_type: "::android::hardware::sensors::V1_0::SensorFlagBits" 378 predefined_type: "::android::hardware::sensors::V1_0::SensorFlagBits"
378 } 379 }
379} 380}
@@ -546,8 +547,8 @@ attribute: {
546 struct_value: { 547 struct_value: {
547 name: "uuid" 548 name: "uuid"
548 type: TYPE_ARRAY 549 type: TYPE_ARRAY
550 vector_size: 16
549 vector_value: { 551 vector_value: {
550 vector_size: 16
551 type: TYPE_SCALAR 552 type: TYPE_SCALAR
552 scalar_type: "uint8_t" 553 scalar_type: "uint8_t"
553 } 554 }
@@ -652,8 +653,8 @@ attribute: {
652 union_value: { 653 union_value: {
653 name: "data_int32" 654 name: "data_int32"
654 type: TYPE_ARRAY 655 type: TYPE_ARRAY
656 vector_size: 14
655 vector_value: { 657 vector_value: {
656 vector_size: 14
657 type: TYPE_SCALAR 658 type: TYPE_SCALAR
658 scalar_type: "int32_t" 659 scalar_type: "int32_t"
659 } 660 }
@@ -661,8 +662,8 @@ attribute: {
661 union_value: { 662 union_value: {
662 name: "data_float" 663 name: "data_float"
663 type: TYPE_ARRAY 664 type: TYPE_ARRAY
665 vector_size: 14
664 vector_value: { 666 vector_value: {
665 vector_size: 14
666 type: TYPE_SCALAR 667 type: TYPE_SCALAR
667 scalar_type: "float_t" 668 scalar_type: "float_t"
668 } 669 }
@@ -726,8 +727,8 @@ attribute: {
726 union_value: { 727 union_value: {
727 name: "pose6DOF" 728 name: "pose6DOF"
728 type: TYPE_ARRAY 729 type: TYPE_ARRAY
730 vector_size: 15
729 vector_value: { 731 vector_value: {
730 vector_size: 15
731 type: TYPE_SCALAR 732 type: TYPE_SCALAR
732 scalar_type: "float_t" 733 scalar_type: "float_t"
733 } 734 }
@@ -745,8 +746,8 @@ attribute: {
745 union_value: { 746 union_value: {
746 name: "data" 747 name: "data"
747 type: TYPE_ARRAY 748 type: TYPE_ARRAY
749 vector_size: 16
748 vector_value: { 750 vector_value: {
749 vector_size: 16
750 type: TYPE_SCALAR 751 type: TYPE_SCALAR
751 scalar_type: "float_t" 752 scalar_type: "float_t"
752 } 753 }
diff --git a/thermal/1.0/vts/Thermal.vts b/thermal/1.0/vts/Thermal.vts
index e76d943f..46119242 100644
--- a/thermal/1.0/vts/Thermal.vts
+++ b/thermal/1.0/vts/Thermal.vts
@@ -5,6 +5,7 @@ component_name: "IThermal"
5package: "android.hardware.thermal" 5package: "android.hardware.thermal"
6 6
7import: "android.hardware.thermal@1.0::types" 7import: "android.hardware.thermal@1.0::types"
8import: "android.hidl.base@1.0::types"
8 9
9interface: { 10interface: {
10 api: { 11 api: {
diff --git a/thermal/1.0/vts/types.vts b/thermal/1.0/vts/types.vts
index 1e60f48b..f004bd88 100644
--- a/thermal/1.0/vts/types.vts
+++ b/thermal/1.0/vts/types.vts
@@ -9,27 +9,27 @@ attribute: {
9 name: "::android::hardware::thermal::V1_0::TemperatureType" 9 name: "::android::hardware::thermal::V1_0::TemperatureType"
10 type: TYPE_ENUM 10 type: TYPE_ENUM
11 enum_value: { 11 enum_value: {
12 scalar_type: "uint32_t" 12 scalar_type: "int32_t"
13 13
14 enumerator: "UNKNOWN" 14 enumerator: "UNKNOWN"
15 scalar_value: { 15 scalar_value: {
16 uint32_t: 1000 16 int32_t: -1
17 } 17 }
18 enumerator: "CPU" 18 enumerator: "CPU"
19 scalar_value: { 19 scalar_value: {
20 uint32_t: 0 20 int32_t: 0
21 } 21 }
22 enumerator: "GPU" 22 enumerator: "GPU"
23 scalar_value: { 23 scalar_value: {
24 uint32_t: 1 24 int32_t: 1
25 } 25 }
26 enumerator: "BATTERY" 26 enumerator: "BATTERY"
27 scalar_value: { 27 scalar_value: {
28 uint32_t: 2 28 int32_t: 2
29 } 29 }
30 enumerator: "SKIN" 30 enumerator: "SKIN"
31 scalar_value: { 31 scalar_value: {
32 uint32_t: 3 32 int32_t: 3
33 } 33 }
34 } 34 }
35} 35}
diff --git a/tv/cec/1.0/vts/HdmiCec.vts b/tv/cec/1.0/vts/HdmiCec.vts
index d7d09de6..6e71d24e 100644
--- a/tv/cec/1.0/vts/HdmiCec.vts
+++ b/tv/cec/1.0/vts/HdmiCec.vts
@@ -6,6 +6,7 @@ package: "android.hardware.tv.cec"
6 6
7import: "android.hardware.tv.cec@1.0::IHdmiCecCallback" 7import: "android.hardware.tv.cec@1.0::IHdmiCecCallback"
8import: "android.hardware.tv.cec@1.0::types" 8import: "android.hardware.tv.cec@1.0::types"
9import: "android.hidl.base@1.0::types"
9 10
10interface: { 11interface: {
11 api: { 12 api: {
@@ -67,8 +68,7 @@ interface: {
67 name: "setCallback" 68 name: "setCallback"
68 arg: { 69 arg: {
69 type: TYPE_HIDL_CALLBACK 70 type: TYPE_HIDL_CALLBACK
70 predefined_type: "IHdmiCecCallback" 71 predefined_type: "::android::hardware::tv::cec::V1_0::IHdmiCecCallback"
71 is_callback: true
72 } 72 }
73 callflow: { 73 callflow: {
74 next: "addLogicalAddress" 74 next: "addLogicalAddress"
diff --git a/tv/cec/1.0/vts/HdmiCecCallback.vts b/tv/cec/1.0/vts/HdmiCecCallback.vts
index 864e6f52..a98db06b 100644
--- a/tv/cec/1.0/vts/HdmiCecCallback.vts
+++ b/tv/cec/1.0/vts/HdmiCecCallback.vts
@@ -5,6 +5,7 @@ component_name: "IHdmiCecCallback"
5package: "android.hardware.tv.cec" 5package: "android.hardware.tv.cec"
6 6
7import: "android.hardware.tv.cec@1.0::types" 7import: "android.hardware.tv.cec@1.0::types"
8import: "android.hidl.base@1.0::types"
8 9
9interface: { 10interface: {
10 api: { 11 api: {
diff --git a/tv/input/1.0/vts/TvInput.vts b/tv/input/1.0/vts/TvInput.vts
index 73b322a9..f049fc1b 100644
--- a/tv/input/1.0/vts/TvInput.vts
+++ b/tv/input/1.0/vts/TvInput.vts
@@ -4,16 +4,17 @@ component_name: "ITvInput"
4 4
5package: "android.hardware.tv.input" 5package: "android.hardware.tv.input"
6 6
7import: "android.hardware.audio.common@2.0::types"
7import: "android.hardware.tv.input@1.0::ITvInputCallback" 8import: "android.hardware.tv.input@1.0::ITvInputCallback"
8import: "android.hardware.tv.input@1.0::types" 9import: "android.hardware.tv.input@1.0::types"
10import: "android.hidl.base@1.0::types"
9 11
10interface: { 12interface: {
11 api: { 13 api: {
12 name: "setCallback" 14 name: "setCallback"
13 arg: { 15 arg: {
14 type: TYPE_HIDL_CALLBACK 16 type: TYPE_HIDL_CALLBACK
15 predefined_type: "ITvInputCallback" 17 predefined_type: "::android::hardware::tv::input::V1_0::ITvInputCallback"
16 is_callback: true
17 } 18 }
18 callflow: { 19 callflow: {
19 entry: true 20 entry: true
diff --git a/tv/input/1.0/vts/TvInputCallback.vts b/tv/input/1.0/vts/TvInputCallback.vts
index b1738a82..8082b9f7 100644
--- a/tv/input/1.0/vts/TvInputCallback.vts
+++ b/tv/input/1.0/vts/TvInputCallback.vts
@@ -4,7 +4,9 @@ component_name: "ITvInputCallback"
4 4
5package: "android.hardware.tv.input" 5package: "android.hardware.tv.input"
6 6
7import: "android.hardware.audio.common@2.0::types"
7import: "android.hardware.tv.input@1.0::types" 8import: "android.hardware.tv.input@1.0::types"
9import: "android.hidl.base@1.0::types"
8 10
9interface: { 11interface: {
10 api: { 12 api: {
diff --git a/tv/input/1.0/vts/types.vts b/tv/input/1.0/vts/types.vts
index d03e065f..cb1d4725 100644
--- a/tv/input/1.0/vts/types.vts
+++ b/tv/input/1.0/vts/types.vts
@@ -7,1926 +7,6 @@ package: "android.hardware.tv.input"
7import: "android.hardware.audio.common@2.0::types" 7import: "android.hardware.audio.common@2.0::types"
8 8
9attribute: { 9attribute: {
10 name: "::android::hardware::audio::common::V2_0::AudioHandleConsts"
11 type: TYPE_ENUM
12 enum_value: {
13 scalar_type: "int32_t"
14
15 enumerator: "AUDIO_IO_HANDLE_NONE"
16 scalar_value: {
17 int32_t: 0
18 }
19 enumerator: "AUDIO_MODULE_HANDLE_NONE"
20 scalar_value: {
21 int32_t: 0
22 }
23 enumerator: "AUDIO_PORT_HANDLE_NONE"
24 scalar_value: {
25 int32_t: 0
26 }
27 enumerator: "AUDIO_PATCH_HANDLE_NONE"
28 scalar_value: {
29 int32_t: 0
30 }
31 }
32}
33
34attribute: {
35 name: "::android::hardware::audio::common::V2_0::Uuid"
36 type: TYPE_STRUCT
37 struct_value: {
38 name: "timeLow"
39 type: TYPE_SCALAR
40 scalar_type: "uint32_t"
41 }
42 struct_value: {
43 name: "timeMid"
44 type: TYPE_SCALAR
45 scalar_type: "uint16_t"
46 }
47 struct_value: {
48 name: "versionAndTimeHigh"
49 type: TYPE_SCALAR
50 scalar_type: "uint16_t"
51 }
52 struct_value: {
53 name: "variantAndClockSeqHigh"
54 type: TYPE_SCALAR
55 scalar_type: "uint16_t"
56 }
57 struct_value: {
58 name: "node"
59 type: TYPE_ARRAY
60 vector_value: {
61 vector_size: 6
62 type: TYPE_SCALAR
63 scalar_type: "uint8_t"
64 }
65 }
66}
67
68attribute: {
69 name: "::android::hardware::audio::common::V2_0::AudioStreamType"
70 type: TYPE_ENUM
71 enum_value: {
72 scalar_type: "int32_t"
73
74 enumerator: "DEFAULT"
75 scalar_value: {
76 int32_t: -1
77 }
78 enumerator: "MIN"
79 scalar_value: {
80 int32_t: 0
81 }
82 enumerator: "VOICE_CALL"
83 scalar_value: {
84 int32_t: 0
85 }
86 enumerator: "SYSTEM"
87 scalar_value: {
88 int32_t: 1
89 }
90 enumerator: "RING"
91 scalar_value: {
92 int32_t: 2
93 }
94 enumerator: "MUSIC"
95 scalar_value: {
96 int32_t: 3
97 }
98 enumerator: "ALARM"
99 scalar_value: {
100 int32_t: 4
101 }
102 enumerator: "NOTIFICATION"
103 scalar_value: {
104 int32_t: 5
105 }
106 enumerator: "BLUETOOTH_SCO"
107 scalar_value: {
108 int32_t: 6
109 }
110 enumerator: "ENFORCED_AUDIBLE"
111 scalar_value: {
112 int32_t: 7
113 }
114 enumerator: "DTMF"
115 scalar_value: {
116 int32_t: 8
117 }
118 enumerator: "TTS"
119 scalar_value: {
120 int32_t: 9
121 }
122 enumerator: "ACCESSIBILITY"
123 scalar_value: {
124 int32_t: 10
125 }
126 enumerator: "REROUTING"
127 scalar_value: {
128 int32_t: 11
129 }
130 enumerator: "PATCH"
131 scalar_value: {
132 int32_t: 12
133 }
134 enumerator: "PUBLIC_CNT"
135 scalar_value: {
136 int32_t: 11
137 }
138 enumerator: "FOR_POLICY_CNT"
139 scalar_value: {
140 int32_t: 12
141 }
142 enumerator: "CNT"
143 scalar_value: {
144 int32_t: 13
145 }
146 }
147}
148
149attribute: {
150 name: "::android::hardware::audio::common::V2_0::AudioSource"
151 type: TYPE_ENUM
152 enum_value: {
153 scalar_type: "int32_t"
154
155 enumerator: "DEFAULT"
156 scalar_value: {
157 int32_t: 0
158 }
159 enumerator: "MIC"
160 scalar_value: {
161 int32_t: 1
162 }
163 enumerator: "VOICE_UPLINK"
164 scalar_value: {
165 int32_t: 2
166 }
167 enumerator: "VOICE_DOWNLINK"
168 scalar_value: {
169 int32_t: 3
170 }
171 enumerator: "VOICE_CALL"
172 scalar_value: {
173 int32_t: 4
174 }
175 enumerator: "CAMCORDER"
176 scalar_value: {
177 int32_t: 5
178 }
179 enumerator: "VOICE_RECOGNITION"
180 scalar_value: {
181 int32_t: 6
182 }
183 enumerator: "VOICE_COMMUNICATION"
184 scalar_value: {
185 int32_t: 7
186 }
187 enumerator: "REMOTE_SUBMIX"
188 scalar_value: {
189 int32_t: 8
190 }
191 enumerator: "UNPROCESSED"
192 scalar_value: {
193 int32_t: 9
194 }
195 enumerator: "CNT"
196 scalar_value: {
197 int32_t: 10
198 }
199 enumerator: "MAX"
200 scalar_value: {
201 int32_t: 9
202 }
203 enumerator: "FM_TUNER"
204 scalar_value: {
205 int32_t: 1998
206 }
207 enumerator: "HOTWORD"
208 scalar_value: {
209 int32_t: 1999
210 }
211 }
212}
213
214attribute: {
215 name: "::android::hardware::audio::common::V2_0::AudioSessionConsts"
216 type: TYPE_ENUM
217 enum_value: {
218 scalar_type: "int32_t"
219
220 enumerator: "OUTPUT_STAGE"
221 scalar_value: {
222 int32_t: -1
223 }
224 enumerator: "OUTPUT_MIX"
225 scalar_value: {
226 int32_t: 0
227 }
228 enumerator: "ALLOCATE"
229 scalar_value: {
230 int32_t: 0
231 }
232 enumerator: "NONE"
233 scalar_value: {
234 int32_t: 0
235 }
236 }
237}
238
239attribute: {
240 name: "::android::hardware::audio::common::V2_0::AudioFormat"
241 type: TYPE_ENUM
242 enum_value: {
243 scalar_type: "uint32_t"
244
245 enumerator: "INVALID"
246 scalar_value: {
247 uint32_t: 4294967295
248 }
249 enumerator: "DEFAULT"
250 scalar_value: {
251 uint32_t: 0
252 }
253 enumerator: "PCM"
254 scalar_value: {
255 uint32_t: 0
256 }
257 enumerator: "MP3"
258 scalar_value: {
259 uint32_t: 16777216
260 }
261 enumerator: "AMR_NB"
262 scalar_value: {
263 uint32_t: 33554432
264 }
265 enumerator: "AMR_WB"
266 scalar_value: {
267 uint32_t: 50331648
268 }
269 enumerator: "AAC"
270 scalar_value: {
271 uint32_t: 67108864
272 }
273 enumerator: "HE_AAC_V1"
274 scalar_value: {
275 uint32_t: 83886080
276 }
277 enumerator: "HE_AAC_V2"
278 scalar_value: {
279 uint32_t: 100663296
280 }
281 enumerator: "VORBIS"
282 scalar_value: {
283 uint32_t: 117440512
284 }
285 enumerator: "OPUS"
286 scalar_value: {
287 uint32_t: 134217728
288 }
289 enumerator: "AC3"
290 scalar_value: {
291 uint32_t: 150994944
292 }
293 enumerator: "E_AC3"
294 scalar_value: {
295 uint32_t: 167772160
296 }
297 enumerator: "DTS"
298 scalar_value: {
299 uint32_t: 184549376
300 }
301 enumerator: "DTS_HD"
302 scalar_value: {
303 uint32_t: 201326592
304 }
305 enumerator: "IEC61937"
306 scalar_value: {
307 uint32_t: 218103808
308 }
309 enumerator: "DOLBY_TRUEHD"
310 scalar_value: {
311 uint32_t: 234881024
312 }
313 enumerator: "EVRC"
314 scalar_value: {
315 uint32_t: 268435456
316 }
317 enumerator: "EVRCB"
318 scalar_value: {
319 uint32_t: 285212672
320 }
321 enumerator: "EVRCWB"
322 scalar_value: {
323 uint32_t: 301989888
324 }
325 enumerator: "EVRCNW"
326 scalar_value: {
327 uint32_t: 318767104
328 }
329 enumerator: "AAC_ADIF"
330 scalar_value: {
331 uint32_t: 335544320
332 }
333 enumerator: "WMA"
334 scalar_value: {
335 uint32_t: 352321536
336 }
337 enumerator: "WMA_PRO"
338 scalar_value: {
339 uint32_t: 369098752
340 }
341 enumerator: "AMR_WB_PLUS"
342 scalar_value: {
343 uint32_t: 385875968
344 }
345 enumerator: "MP2"
346 scalar_value: {
347 uint32_t: 402653184
348 }
349 enumerator: "QCELP"
350 scalar_value: {
351 uint32_t: 419430400
352 }
353 enumerator: "DSD"
354 scalar_value: {
355 uint32_t: 436207616
356 }
357 enumerator: "FLAC"
358 scalar_value: {
359 uint32_t: 452984832
360 }
361 enumerator: "ALAC"
362 scalar_value: {
363 uint32_t: 469762048
364 }
365 enumerator: "APE"
366 scalar_value: {
367 uint32_t: 486539264
368 }
369 enumerator: "AAC_ADTS"
370 scalar_value: {
371 uint32_t: 503316480
372 }
373 enumerator: "SBC"
374 scalar_value: {
375 uint32_t: 520093696
376 }
377 enumerator: "APTX"
378 scalar_value: {
379 uint32_t: 536870912
380 }
381 enumerator: "APTX_HD"
382 scalar_value: {
383 uint32_t: 553648128
384 }
385 enumerator: "LDAC"
386 scalar_value: {
387 uint32_t: 570425344
388 }
389 enumerator: "MAIN_MASK"
390 scalar_value: {
391 uint32_t: 4278190080
392 }
393 enumerator: "SUB_MASK"
394 scalar_value: {
395 uint32_t: 16777215
396 }
397 enumerator: "PCM_SUB_16_BIT"
398 scalar_value: {
399 uint32_t: 1
400 }
401 enumerator: "PCM_SUB_8_BIT"
402 scalar_value: {
403 uint32_t: 2
404 }
405 enumerator: "PCM_SUB_32_BIT"
406 scalar_value: {
407 uint32_t: 3
408 }
409 enumerator: "PCM_SUB_8_24_BIT"
410 scalar_value: {
411 uint32_t: 4
412 }
413 enumerator: "PCM_SUB_FLOAT"
414 scalar_value: {
415 uint32_t: 5
416 }
417 enumerator: "PCM_SUB_24_BIT_PACKED"
418 scalar_value: {
419 uint32_t: 6
420 }
421 enumerator: "MP3_SUB_NONE"
422 scalar_value: {
423 uint32_t: 0
424 }
425 enumerator: "AMR_SUB_NONE"
426 scalar_value: {
427 uint32_t: 0
428 }
429 enumerator: "AAC_SUB_MAIN"
430 scalar_value: {
431 uint32_t: 1
432 }
433 enumerator: "AAC_SUB_LC"
434 scalar_value: {
435 uint32_t: 2
436 }
437 enumerator: "AAC_SUB_SSR"
438 scalar_value: {
439 uint32_t: 4
440 }
441 enumerator: "AAC_SUB_LTP"
442 scalar_value: {
443 uint32_t: 8
444 }
445 enumerator: "AAC_SUB_HE_V1"
446 scalar_value: {
447 uint32_t: 16
448 }
449 enumerator: "AAC_SUB_SCALABLE"
450 scalar_value: {
451 uint32_t: 32
452 }
453 enumerator: "AAC_SUB_ERLC"
454 scalar_value: {
455 uint32_t: 64
456 }
457 enumerator: "AAC_SUB_LD"
458 scalar_value: {
459 uint32_t: 128
460 }
461 enumerator: "AAC_SUB_HE_V2"
462 scalar_value: {
463 uint32_t: 256
464 }
465 enumerator: "AAC_SUB_ELD"
466 scalar_value: {
467 uint32_t: 512
468 }
469 enumerator: "VORBIS_SUB_NONE"
470 scalar_value: {
471 uint32_t: 0
472 }
473 enumerator: "PCM_16_BIT"
474 scalar_value: {
475 uint32_t: 1
476 }
477 enumerator: "PCM_8_BIT"
478 scalar_value: {
479 uint32_t: 2
480 }
481 enumerator: "PCM_32_BIT"
482 scalar_value: {
483 uint32_t: 3
484 }
485 enumerator: "PCM_8_24_BIT"
486 scalar_value: {
487 uint32_t: 4
488 }
489 enumerator: "PCM_FLOAT"
490 scalar_value: {
491 uint32_t: 5
492 }
493 enumerator: "PCM_24_BIT_PACKED"
494 scalar_value: {
495 uint32_t: 6
496 }
497 enumerator: "AAC_MAIN"
498 scalar_value: {
499 uint32_t: 67108865
500 }
501 enumerator: "AAC_LC"
502 scalar_value: {
503 uint32_t: 67108866
504 }
505 enumerator: "AAC_SSR"
506 scalar_value: {
507 uint32_t: 67108868
508 }
509 enumerator: "AAC_LTP"
510 scalar_value: {
511 uint32_t: 67108872
512 }
513 enumerator: "AAC_HE_V1"
514 scalar_value: {
515 uint32_t: 67108880
516 }
517 enumerator: "AAC_SCALABLE"
518 scalar_value: {
519 uint32_t: 67108896
520 }
521 enumerator: "AAC_ERLC"
522 scalar_value: {
523 uint32_t: 67108928
524 }
525 enumerator: "AAC_LD"
526 scalar_value: {
527 uint32_t: 67108992
528 }
529 enumerator: "AAC_HE_V2"
530 scalar_value: {
531 uint32_t: 67109120
532 }
533 enumerator: "AAC_ELD"
534 scalar_value: {
535 uint32_t: 67109376
536 }
537 enumerator: "AAC_ADTS_MAIN"
538 scalar_value: {
539 uint32_t: 503316481
540 }
541 enumerator: "AAC_ADTS_LC"
542 scalar_value: {
543 uint32_t: 503316482
544 }
545 enumerator: "AAC_ADTS_SSR"
546 scalar_value: {
547 uint32_t: 503316484
548 }
549 enumerator: "AAC_ADTS_LTP"
550 scalar_value: {
551 uint32_t: 503316488
552 }
553 enumerator: "AAC_ADTS_HE_V1"
554 scalar_value: {
555 uint32_t: 503316496
556 }
557 enumerator: "AAC_ADTS_SCALABLE"
558 scalar_value: {
559 uint32_t: 503316512
560 }
561 enumerator: "AAC_ADTS_ERLC"
562 scalar_value: {
563 uint32_t: 503316544
564 }
565 enumerator: "AAC_ADTS_LD"
566 scalar_value: {
567 uint32_t: 503316608
568 }
569 enumerator: "AAC_ADTS_HE_V2"
570 scalar_value: {
571 uint32_t: 503316736
572 }
573 enumerator: "AAC_ADTS_ELD"
574 scalar_value: {
575 uint32_t: 503316992
576 }
577 }
578}
579
580attribute: {
581 name: "::android::hardware::audio::common::V2_0::FixedChannelCount"
582 type: TYPE_ENUM
583 enum_value: {
584 scalar_type: "int32_t"
585
586 enumerator: "FCC_2"
587 scalar_value: {
588 int32_t: 2
589 }
590 enumerator: "FCC_8"
591 scalar_value: {
592 int32_t: 8
593 }
594 }
595}
596
597attribute: {
598 name: "::android::hardware::audio::common::V2_0::AudioChannelMask"
599 type: TYPE_ENUM
600 enum_value: {
601 scalar_type: "uint32_t"
602
603 enumerator: "REPRESENTATION_POSITION"
604 scalar_value: {
605 uint32_t: 0
606 }
607 enumerator: "REPRESENTATION_INDEX"
608 scalar_value: {
609 uint32_t: 2
610 }
611 enumerator: "NONE"
612 scalar_value: {
613 uint32_t: 0
614 }
615 enumerator: "INVALID"
616 scalar_value: {
617 uint32_t: 3221225472
618 }
619 enumerator: "OUT_FRONT_LEFT"