Merge "Update .vts files on master based on the latest .hal file and hidl-gen" (f008f8fd) · Commits · e / os / android_hardware_interfaces

audio/common/2.0/vts/types.vts

+34 −7

Original line number	Diff line number	Diff line
		@@ -56,8 +56,8 @@ attribute: {
		struct_value: {
		name: "node"
		type: TYPE_ARRAY
		vector_value: {
		vector_size: 6
		vector_value: {
		type: TYPE_SCALAR
		scalar_type: "uint8_t"
		}
		@@ -381,10 +381,14 @@ attribute: {
		scalar_value: {
		uint32_t: 553648128
		}
		enumerator: "LDAC"
		enumerator: "AC4"
		scalar_value: {
		uint32_t: 570425344
		}
		enumerator: "LDAC"
		scalar_value: {
		uint32_t: 587202560
		}
		enumerator: "MAIN_MASK"
		scalar_value: {
		uint32_t: 4278190080
		@@ -811,6 +815,10 @@ attribute: {
		scalar_value: {
		uint32_t: 48
		}
		enumerator: "IN_6"
		scalar_value: {
		uint32_t: 252
		}
		enumerator: "IN_VOICE_UPLINK_MONO"
		scalar_value: {
		uint32_t: 16400
		@@ -1357,13 +1365,17 @@ attribute: {
		scalar_value: {
		int32_t: 15
		}
		enumerator: "CNT"
		enumerator: "ASSISTANT"
		scalar_value: {
		int32_t: 16
		}
		enumerator: "CNT"
		scalar_value: {
		int32_t: 17
		}
		enumerator: "MAX"
		scalar_value: {
		int32_t: 15
		int32_t: 16
		}
		}
		}
		@@ -1545,8 +1557,8 @@ attribute: {
		struct_value: {
		name: "values"
		type: TYPE_ARRAY
		vector_value: {
		vector_size: 32
		vector_value: {
		type: TYPE_SCALAR
		scalar_type: "int32_t"
		}
		@@ -1620,8 +1632,8 @@ attribute: {
		struct_value: {
		name: "address"
		type: TYPE_ARRAY
		vector_value: {
		vector_size: 32
		vector_value: {
		type: TYPE_SCALAR
		scalar_type: "uint8_t"
		}
		@@ -1785,8 +1797,8 @@ attribute: {
		struct_value: {
		name: "address"
		type: TYPE_ARRAY
		vector_value: {
		vector_size: 32
		vector_value: {
		type: TYPE_SCALAR
		scalar_type: "uint8_t"
		}
		@@ -1925,3 +1937,18 @@ attribute: {
		}
		}

		attribute: {
		name: "::android::hardware::audio::common::V2_0::ThreadInfo"
		type: TYPE_STRUCT
		struct_value: {
		name: "pid"
		type: TYPE_SCALAR
		scalar_type: "int64_t"
		}
		struct_value: {
		name: "tid"
		type: TYPE_SCALAR
		scalar_type: "int64_t"
		}
		}

automotive/vehicle/2.0/vts/Vehicle.vts

+7 −8

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ package: "android.hardware.automotive.vehicle"

		import: "android.hardware.automotive.vehicle@2.0::IVehicleCallback"
		import: "android.hardware.automotive.vehicle@2.0::types"
		import: "android.hidl.base@1.0::types"

		interface: {
		api: {
		@@ -35,8 +36,8 @@ interface: {
		arg: {
		type: TYPE_VECTOR
		vector_value: {
		type: TYPE_ENUM
		predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehicleProperty"
		type: TYPE_SCALAR
		scalar_type: "int32_t"
		}
		}
		}
		@@ -77,8 +78,7 @@ interface: {
		}
		arg: {
		type: TYPE_HIDL_CALLBACK
		predefined_type: "IVehicleCallback"
		is_callback: true
		predefined_type: "::android::hardware::automotive::vehicle::V2_0::IVehicleCallback"
		}
		arg: {
		type: TYPE_VECTOR
		@@ -97,12 +97,11 @@ interface: {
		}
		arg: {
		type: TYPE_HIDL_CALLBACK
		predefined_type: "IVehicleCallback"
		is_callback: true
		predefined_type: "::android::hardware::automotive::vehicle::V2_0::IVehicleCallback"
		}
		arg: {
		type: TYPE_ENUM
		predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehicleProperty"
		type: TYPE_SCALAR
		scalar_type: "int32_t"
		}
		}

automotive/vehicle/2.0/vts/VehicleCallback.vts

+3 −2

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ component_name: "IVehicleCallback"
		package: "android.hardware.automotive.vehicle"

		import: "android.hardware.automotive.vehicle@2.0::types"
		import: "android.hidl.base@1.0::types"

		interface: {
		api: {
		@@ -33,8 +34,8 @@ interface: {
		predefined_type: "::android::hardware::automotive::vehicle::V2_0::StatusCode"
		}
		arg: {
		type: TYPE_ENUM
		predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehicleProperty"
		type: TYPE_SCALAR
		scalar_type: "int32_t"
		}
		arg: {
		type: TYPE_SCALAR

automotive/vehicle/2.0/vts/types.vts

+114 −7

Original line number	Diff line number	Diff line
		@@ -162,6 +162,10 @@ attribute: {
		scalar_value: {
		int32_t: 291504901
		}
		enumerator: "WHEEL_TICK"
		scalar_value: {
		int32_t: 291570438
		}
		enumerator: "GEAR_SELECTION"
		scalar_value: {
		int32_t: 289408000
		@@ -282,10 +286,18 @@ attribute: {
		scalar_value: {
		int32_t: 289474816
		}
		enumerator: "AUDIO_FOCUS_EXT_SYNC"
		scalar_value: {
		int32_t: 289474832
		}
		enumerator: "AUDIO_VOLUME"
		scalar_value: {
		int32_t: 289474817
		}
		enumerator: "AUDIO_VOLUME_EXT_SYNC"
		scalar_value: {
		int32_t: 289474833
		}
		enumerator: "AUDIO_VOLUME_LIMIT"
		scalar_value: {
		int32_t: 289474818
		@@ -302,9 +314,17 @@ attribute: {
		scalar_value: {
		int32_t: 289474821
		}
		enumerator: "AUDIO_STREAM_STATE"
		scalar_value: {
		int32_t: 289474822
		}
		enumerator: "AUDIO_PARAMETERS"
		scalar_value: {
		int32_t: 286263559
		}
		enumerator: "AP_POWER_STATE"
		scalar_value: {
		int32_t: 2560
		int32_t: 289475072
		}
		enumerator: "DISPLAY_BRIGHTNESS"
		scalar_value: {
		@@ -506,6 +526,14 @@ attribute: {
		scalar_value: {
		int32_t: 299896065
		}
		enumerator: "OBD2_FREEZE_FRAME_INFO"
		scalar_value: {
		int32_t: 299896066
		}
		enumerator: "OBD2_FREEZE_FRAME_CLEAR"
		scalar_value: {
		int32_t: 299896067
		}
		}
		}

		@@ -1585,8 +1613,8 @@ attribute: {
		type: TYPE_STRUCT
		struct_value: {
		name: "prop"
		type: TYPE_ENUM
		predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehicleProperty"
		type: TYPE_SCALAR
		scalar_type: "int32_t"
		}
		struct_value: {
		name: "access"
		@@ -1685,8 +1713,8 @@ attribute: {
		}
		struct_value: {
		name: "prop"
		type: TYPE_ENUM
		predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehicleProperty"
		type: TYPE_SCALAR
		scalar_type: "int32_t"
		}
		struct_value: {
		name: "timestamp"
		@@ -1793,8 +1821,8 @@ attribute: {
		type: TYPE_STRUCT
		struct_value: {
		name: "propId"
		type: TYPE_ENUM
		predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehicleProperty"
		type: TYPE_SCALAR
		scalar_type: "int32_t"
		}
		struct_value: {
		name: "vehicleAreas"
		@@ -2103,6 +2131,35 @@ attribute: {
		}
		}

		attribute: {
		name: "::android::hardware::automotive::vehicle::V2_0::Wheel"
		type: TYPE_ENUM
		enum_value: {
		scalar_type: "int32_t"

		enumerator: "UNKNOWN"
		scalar_value: {
		int32_t: 0
		}
		enumerator: "LEFT_FRONT"
		scalar_value: {
		int32_t: 1
		}
		enumerator: "RIGHT_FRONT"
		scalar_value: {
		int32_t: 2
		}
		enumerator: "LEFT_REAR"
		scalar_value: {
		int32_t: 4
		}
		enumerator: "RIGHT_REAR"
		scalar_value: {
		int32_t: 8
		}
		}
		}

		attribute: {
		name: "::android::hardware::automotive::vehicle::V2_0::SecondaryAirStatus"
		type: TYPE_ENUM
		@@ -2251,6 +2308,14 @@ attribute: {
		scalar_value: {
		int32_t: 2
		}
		enumerator: "IGNITION_SPECIFIC_MONITORS"
		scalar_value: {
		int32_t: 3
		}
		enumerator: "INTAKE_AIR_TEMPERATURE"
		scalar_value: {
		int32_t: 4
		}
		enumerator: "COMMANDED_SECONDARY_AIR_STATUS"
		scalar_value: {
		int32_t: 5
		@@ -2671,3 +2736,45 @@ attribute: {
		}
		}

		attribute: {
		name: "::android::hardware::automotive::vehicle::V2_0::VmsMessageType"
		type: TYPE_ENUM
		enum_value: {
		scalar_type: "int32_t"

		enumerator: "SUBSCRIBE"
		scalar_value: {
		int32_t: 1
		}
		enumerator: "UNSUBSCRIBE"
		scalar_value: {
		int32_t: 2
		}
		enumerator: "DATA"
		scalar_value: {
		int32_t: 3
		}
		}
		}

		attribute: {
		name: "::android::hardware::automotive::vehicle::V2_0::VmsMessageIntegerValuesIndex"
		type: TYPE_ENUM
		enum_value: {
		scalar_type: "int32_t"

		enumerator: "VMS_MESSAGE_TYPE"
		scalar_value: {
		int32_t: 1
		}
		enumerator: "VMS_LAYER_ID"
		scalar_value: {
		int32_t: 2
		}
		enumerator: "VMS_LAYER_VERSION"
		scalar_value: {
		int32_t: 3
		}
		}
		}

biometrics/fingerprint/2.1/vts/BiometricsFingerprint.vts

+0 −270

Original line number	Diff line number	Diff line
		@@ -9,276 +9,6 @@ import: "android.hardware.biometrics.fingerprint@2.1::types"
		import: "android.hidl.base@1.0::types"

		interface: {
		attribute: {
		name: "::android::hardware::biometrics::fingerprint::V2_1::RequestStatus"
		type: TYPE_ENUM
		enum_value: {
		scalar_type: "int32_t"

		enumerator: "SYS_UNKNOWN"
		scalar_value: {
		int32_t: 1
		}
		enumerator: "SYS_OK"
		scalar_value: {
		int32_t: 0
		}
		enumerator: "SYS_ENOENT"
		scalar_value: {
		int32_t: -2
		}
		enumerator: "SYS_EINTR"
		scalar_value: {
		int32_t: -4
		}
		enumerator: "SYS_EIO"
		scalar_value: {
		int32_t: -5
		}
		enumerator: "SYS_EAGAIN"
		scalar_value: {
		int32_t: -11
		}
		enumerator: "SYS_ENOMEM"
		scalar_value: {
		int32_t: -12
		}
		enumerator: "SYS_EACCES"
		scalar_value: {
		int32_t: -13
		}
		enumerator: "SYS_EFAULT"
		scalar_value: {
		int32_t: -14
		}
		enumerator: "SYS_EBUSY"
		scalar_value: {
		int32_t: -16
		}
		enumerator: "SYS_EINVAL"
		scalar_value: {
		int32_t: -22
		}
		enumerator: "SYS_ENOSPC"
		scalar_value: {
		int32_t: -28
		}
		enumerator: "SYS_ETIMEDOUT"
		scalar_value: {
		int32_t: -110
		}
		}
		}

		attribute: {
		name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintError"
		type: TYPE_ENUM
		enum_value: {
		scalar_type: "int32_t"

		enumerator: "ERROR_NO_ERROR"
		scalar_value: {
		int32_t: 0
		}
		enumerator: "ERROR_HW_UNAVAILABLE"
		scalar_value: {
		int32_t: 1
		}
		enumerator: "ERROR_UNABLE_TO_PROCESS"
		scalar_value: {
		int32_t: 2
		}
		enumerator: "ERROR_TIMEOUT"
		scalar_value: {
		int32_t: 3
		}
		enumerator: "ERROR_NO_SPACE"
		scalar_value: {
		int32_t: 4
		}
		enumerator: "ERROR_CANCELED"
		scalar_value: {
		int32_t: 5
		}
		enumerator: "ERROR_UNABLE_TO_REMOVE"
		scalar_value: {
		int32_t: 6
		}
		enumerator: "ERROR_LOCKOUT"
		scalar_value: {
		int32_t: 7
		}
		enumerator: "ERROR_VENDOR"
		scalar_value: {
		int32_t: 8
		}
		}
		}

		attribute: {
		name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquiredInfo"
		type: TYPE_ENUM
		enum_value: {
		scalar_type: "int32_t"

		enumerator: "ACQUIRED_GOOD"
		scalar_value: {
		int32_t: 0
		}
		enumerator: "ACQUIRED_PARTIAL"
		scalar_value: {
		int32_t: 1
		}
		enumerator: "ACQUIRED_INSUFFICIENT"
		scalar_value: {
		int32_t: 2
		}
		enumerator: "ACQUIRED_IMAGER_DIRTY"
		scalar_value: {
		int32_t: 3
		}
		enumerator: "ACQUIRED_TOO_SLOW"
		scalar_value: {
		int32_t: 4
		}
		enumerator: "ACQUIRED_TOO_FAST"
		scalar_value: {
		int32_t: 5
		}
		enumerator: "ACQUIRED_VENDOR"
		scalar_value: {
		int32_t: 6
		}
		}
		}

		attribute: {
		name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
		type: TYPE_STRUCT
		struct_value: {
		name: "gid"
		type: TYPE_SCALAR
		scalar_type: "uint32_t"
		}
		struct_value: {
		name: "fid"
		type: TYPE_SCALAR
		scalar_type: "uint32_t"
		}
		}

		attribute: {
		name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintEnroll"
		type: TYPE_STRUCT
		struct_value: {
		name: "finger"
		type: TYPE_STRUCT
		predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
		}
		struct_value: {
		name: "samplesRemaining"
		type: TYPE_SCALAR
		scalar_type: "uint32_t"
		}
		struct_value: {
		name: "msg"
		type: TYPE_SCALAR
		scalar_type: "uint64_t"
		}
		}

		attribute: {
		name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintIterator"
		type: TYPE_STRUCT
		struct_value: {
		name: "finger"
		type: TYPE_STRUCT
		predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
		}
		struct_value: {
		name: "remainingTemplates"
		type: TYPE_SCALAR
		scalar_type: "uint32_t"
		}
		}

		attribute: {
		name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquired"
		type: TYPE_STRUCT
		struct_value: {
		name: "acquiredInfo"
		type: TYPE_ENUM
		predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquiredInfo"
		}
		}

		attribute: {
		name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAuthenticated"
		type: TYPE_STRUCT
		struct_value: {
		name: "finger"
		type: TYPE_STRUCT
		predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
		}
		struct_value: {
		name: "hat"
		type: TYPE_ARRAY
		vector_size: 69
		vector_value: {
		type: TYPE_SCALAR
		scalar_type: "uint8_t"
		}
		}
		}

		attribute: {
		name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintMsgType"
		type: TYPE_ENUM
		enum_value: {
		scalar_type: "int32_t"

		enumerator: "ERROR"
		scalar_value: {
		int32_t: -1
		}
		enumerator: "ACQUIRED"
		scalar_value: {
		int32_t: 1
		}
		enumerator: "TEMPLATE_ENROLLING"
		scalar_value: {
		int32_t: 3
		}
		enumerator: "TEMPLATE_REMOVED"
		scalar_value: {
		int32_t: 4
		}
		enumerator: "AUTHENTICATED"
		scalar_value: {
		int32_t: 5
		}
		enumerator: "TEMPLATE_ENUMERATING"
		scalar_value: {
		int32_t: 6
		}
		}
		}

		attribute: {
		name: "::android::hidl::base::V1_0::DebugInfo"
		type: TYPE_STRUCT
		struct_value: {
		name: "pid"
		type: TYPE_SCALAR
		scalar_type: "int32_t"
		}
		struct_value: {
		name: "ptr"
		type: TYPE_SCALAR
		scalar_type: "uint64_t"
		}
		}

		api: {
		name: "setNotify"
		return_type_hidl: {