Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50b22176 authored Jun 12, 2024 by Treehugger Robot Committed by Automerger Merge Worker Jun 12, 2024

Merge "LeAudio: Fix broadcast quality index conversion to AIDL" into main am:...

Merge "LeAudio: Fix broadcast quality index conversion to AIDL" into main am: 15951f0e am: e0f55557

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3125417

Change-Id: I5afe798277e996369317d0c2bc7f635ab7316c58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 7df9b557 e0f55557

system/audio_hal_interface/aidl/le_audio_utils.cc

+2 −2

Original line number	Diff line number	Diff line
		@@ -635,10 +635,10 @@ GetStackUnicastConfigurationFromAidlFormat(
		// Note: Currently there is no equivalent of this in the stack data format
		req.bisNumPerSubgroup = 2;

		if (quality == le_audio::kLeAudioQualityStandard) {
		if (quality == le_audio::QUALITY_STANDARD) {
		req.quality = ::aidl::android::hardware::bluetooth::audio::
		IBluetoothAudioProvider::BroadcastQuality::STANDARD;
		} else if (quality == le_audio::kLeAudioQualityHigh) {
		} else if (quality == le_audio::QUALITY_HIGH) {
		req.quality = ::aidl::android::hardware::bluetooth::audio::
		IBluetoothAudioProvider::BroadcastQuality::HIGH;
		}

system/audio_hal_interface/aidl/le_audio_utils_unittest.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -663,7 +663,7 @@ PrepareReferenceBroadcastRequirements() {

		std::pair<::bluetooth::le_audio::types::LeAudioContextType, uint8_t>
		stack_req = std::make_pair(le_audio::types::LeAudioContextType::MEDIA,
		le_audio::kLeAudioQualityHigh);
		le_audio::QUALITY_HIGH);
		::aidl::android::hardware::bluetooth::audio::IBluetoothAudioProvider::
		LeAudioBroadcastSubgroupConfigurationRequirement aidl_req = {
		.audioContext.bitmask =