Snap for 8157174 from 2e0754c8d02cd37646b80a8ce3f48037b212097d to tm-release (aadc4e4d) · Commits · e / os / android_hardware_interfaces

audio/7.1/config/api/current.txt

+4 −0

audio/7.1/config/audio_policy_configuration.xsd

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -180,6 +180,7 @@
	<xs:enumeration value="AUDIO_OUTPUT_FLAG_INCALL_MUSIC" />		<xs:enumeration value="AUDIO_OUTPUT_FLAG_INCALL_MUSIC" />
	<xs:enumeration value="AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD" />		<xs:enumeration value="AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD" />
	<xs:enumeration value="AUDIO_OUTPUT_FLAG_SPATIALIZER" />		<xs:enumeration value="AUDIO_OUTPUT_FLAG_SPATIALIZER" />
			<xs:enumeration value="AUDIO_OUTPUT_FLAG_ULTRASOUND" />
	<xs:enumeration value="AUDIO_INPUT_FLAG_FAST" />		<xs:enumeration value="AUDIO_INPUT_FLAG_FAST" />
	<xs:enumeration value="AUDIO_INPUT_FLAG_HW_HOTWORD" />		<xs:enumeration value="AUDIO_INPUT_FLAG_HW_HOTWORD" />
	<xs:enumeration value="AUDIO_INPUT_FLAG_RAW" />		<xs:enumeration value="AUDIO_INPUT_FLAG_RAW" />
	@@ -188,6 +189,7 @@
	<xs:enumeration value="AUDIO_INPUT_FLAG_VOIP_TX" />		<xs:enumeration value="AUDIO_INPUT_FLAG_VOIP_TX" />
	<xs:enumeration value="AUDIO_INPUT_FLAG_HW_AV_SYNC" />		<xs:enumeration value="AUDIO_INPUT_FLAG_HW_AV_SYNC" />
	<xs:enumeration value="AUDIO_INPUT_FLAG_DIRECT" />		<xs:enumeration value="AUDIO_INPUT_FLAG_DIRECT" />
			<xs:enumeration value="AUDIO_INPUT_FLAG_ULTRASOUND" />
	</xs:restriction>		</xs:restriction>
	</xs:simpleType>		</xs:simpleType>
	<xs:simpleType name="audioInOutFlags">		<xs:simpleType name="audioInOutFlags">
	@@ -471,6 +473,7 @@
	<xs:enumeration value="AUDIO_CONTENT_TYPE_MUSIC"/>		<xs:enumeration value="AUDIO_CONTENT_TYPE_MUSIC"/>
	<xs:enumeration value="AUDIO_CONTENT_TYPE_MOVIE"/>		<xs:enumeration value="AUDIO_CONTENT_TYPE_MOVIE"/>
	<xs:enumeration value="AUDIO_CONTENT_TYPE_SONIFICATION"/>		<xs:enumeration value="AUDIO_CONTENT_TYPE_SONIFICATION"/>
			<xs:enumeration value="AUDIO_CONTENT_TYPE_ULTRASOUND"/>
	</xs:restriction>		</xs:restriction>
	</xs:simpleType>		</xs:simpleType>
	<xs:simpleType name="samplingRates">		<xs:simpleType name="samplingRates">
	@@ -742,6 +745,7 @@
	<xs:enumeration value="AUDIO_SOURCE_ECHO_REFERENCE"/>		<xs:enumeration value="AUDIO_SOURCE_ECHO_REFERENCE"/>
	<xs:enumeration value="AUDIO_SOURCE_FM_TUNER"/>		<xs:enumeration value="AUDIO_SOURCE_FM_TUNER"/>
	<xs:enumeration value="AUDIO_SOURCE_HOTWORD"/>		<xs:enumeration value="AUDIO_SOURCE_HOTWORD"/>
			<xs:enumeration value="AUDIO_SOURCE_ULTRASOUND"/>
	</xs:restriction>		</xs:restriction>
	</xs:simpleType>		</xs:simpleType>
	<!-- Enum values of device_category from Volume.h. -->		<!-- Enum values of device_category from Volume.h. -->

automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/include/FakeValueGenerator.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -33,7 +33,7 @@ class FakeValueGenerator {
	virtual ~FakeValueGenerator() = default;		virtual ~FakeValueGenerator() = default;

	// Returns the next event if there is one or {@code std::nullopt} if there is none.		// Returns the next event if there is one or {@code std::nullopt} if there is none.
	virtual std::optional<::aidl::android::hardware::automotive::vehicle::VehiclePropValue>		virtual std::optional<aidl::android::hardware::automotive::vehicle::VehiclePropValue>
	nextEvent() = 0;		nextEvent() = 0;
	};		};

automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/include/GeneratorHub.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -44,7 +44,7 @@ namespace fake {
	class GeneratorHub {		class GeneratorHub {
	public:		public:
	using OnHalEvent = std::function<void(		using OnHalEvent = std::function<void(
	const ::aidl::android::hardware::automotive::vehicle::VehiclePropValue& event)>;		const aidl::android::hardware::automotive::vehicle::VehiclePropValue& event)>;

	explicit GeneratorHub(OnHalEvent&& onHalEvent);		explicit GeneratorHub(OnHalEvent&& onHalEvent);
	~GeneratorHub();		~GeneratorHub();
	@@ -60,7 +60,7 @@ class GeneratorHub {
	private:		private:
	struct VhalEvent {		struct VhalEvent {
	int32_t generatorId;		int32_t generatorId;
	::aidl::android::hardware::automotive::vehicle::VehiclePropValue val;		aidl::android::hardware::automotive::vehicle::VehiclePropValue val;
	};		};

	// Comparator used by priority queue to keep track of soonest event.		// Comparator used by priority queue to keep track of soonest event.

automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/include/JsonFakeValueGenerator.h

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -37,7 +37,7 @@ class JsonFakeValueGenerator : public FakeValueGenerator {
	// {@code int32Values} has less than 2 elements, number of iterations would be set to -1, which		// {@code int32Values} has less than 2 elements, number of iterations would be set to -1, which
	// means iterate indefinitely.		// means iterate indefinitely.
	explicit JsonFakeValueGenerator(		explicit JsonFakeValueGenerator(
	const ::aidl::android::hardware::automotive::vehicle::VehiclePropValue& request);		const aidl::android::hardware::automotive::vehicle::VehiclePropValue& request);
	// Create a new JSON fake value generator using the specified JSON file path. All the events		// Create a new JSON fake value generator using the specified JSON file path. All the events
	// in the JSON file would be generated for number of {@code iteration}. If iteration is 0, no		// in the JSON file would be generated for number of {@code iteration}. If iteration is 0, no
	// value would be generated. If iteration is less than 0, it would iterate indefinitely.		// value would be generated. If iteration is less than 0, it would iterate indefinitely.
	@@ -48,14 +48,14 @@ class JsonFakeValueGenerator : public FakeValueGenerator {

	~JsonFakeValueGenerator() = default;		~JsonFakeValueGenerator() = default;

	std::optional<::aidl::android::hardware::automotive::vehicle::VehiclePropValue> nextEvent()		std::optional<aidl::android::hardware::automotive::vehicle::VehiclePropValue> nextEvent()
	override;		override;
	const std::vector<::aidl::android::hardware::automotive::vehicle::VehiclePropValue>&		const std::vector<aidl::android::hardware::automotive::vehicle::VehiclePropValue>&
	getAllEvents();		getAllEvents();

	private:		private:
	size_t mEventIndex = 0;		size_t mEventIndex = 0;
	std::vector<::aidl::android::hardware::automotive::vehicle::VehiclePropValue> mEvents;		std::vector<aidl::android::hardware::automotive::vehicle::VehiclePropValue> mEvents;
	long mLastEventTimestamp = 0;		long mLastEventTimestamp = 0;
	int32_t mNumOfIterations = 0;		int32_t mNumOfIterations = 0;

Original line number	Original line	Diff line number	Diff line
	@@ -86,6 +86,7 @@ package android.audio.policy.configuration.V7_1 {
	enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_MUSIC;		enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_MUSIC;
	enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_SONIFICATION;		enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_SONIFICATION;
	enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_SPEECH;		enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_SPEECH;
			enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_ULTRASOUND;
	enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_UNKNOWN;		enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_UNKNOWN;
	}		}

	@@ -273,6 +274,7 @@ package android.audio.policy.configuration.V7_1 {
	enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_MMAP_NOIRQ;		enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_MMAP_NOIRQ;
	enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_RAW;		enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_RAW;
	enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_SYNC;		enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_SYNC;
			enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_ULTRASOUND;
	enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_VOIP_TX;		enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_VOIP_TX;
	enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD;		enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD;
	enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_DEEP_BUFFER;		enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_DEEP_BUFFER;
	@@ -290,6 +292,7 @@ package android.audio.policy.configuration.V7_1 {
	enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_SPATIALIZER;		enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_SPATIALIZER;
	enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_SYNC;		enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_SYNC;
	enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_TTS;		enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_TTS;
			enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_ULTRASOUND;
	enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_VOIP_RX;		enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_VOIP_RX;
	}		}

	@@ -314,6 +317,7 @@ package android.audio.policy.configuration.V7_1 {
	enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_HOTWORD;		enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_HOTWORD;
	enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_MIC;		enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_MIC;
	enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_REMOTE_SUBMIX;		enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_REMOTE_SUBMIX;
			enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_ULTRASOUND;
	enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_UNPROCESSED;		enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_UNPROCESSED;
	enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_VOICE_CALL;		enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_VOICE_CALL;
	enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_VOICE_COMMUNICATION;		enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_VOICE_COMMUNICATION;