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

Commit 45f72eb5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Check the broadcast offload audio configuraiton and session type" am:... 

Merge "Check the broadcast offload audio configuraiton and session type" am: ac0c48ba am: ae5f01f6

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



Change-Id: Ie9f81a1514cb6bf20673eea155766604d802ffed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 13f226b2 ae5f01f6

system/audio_hal_interface/aidl/client_interface_aidl.cc

+12 −7
Original line number Diff line number Diff line
@@ -201,12 +201,13 @@ bool BluetoothAudioClientInterface::UpdateAudioConfig( 
  bool is_a2dp_offload_session =

      (transport_->GetSessionType() ==

       SessionType::A2DP_HARDWARE_OFFLOAD_ENCODING_DATAPATH);

  bool is_leaudio_offload_session =

  bool is_leaudio_unicast_offload_session =

      (transport_->GetSessionType() ==

           SessionType::LE_AUDIO_HARDWARE_OFFLOAD_ENCODING_DATAPATH ||

       transport_->GetSessionType() ==

           SessionType::LE_AUDIO_HARDWARE_OFFLOAD_DECODING_DATAPATH ||

       transport_->GetSessionType() ==

           SessionType::LE_AUDIO_HARDWARE_OFFLOAD_DECODING_DATAPATH);

  bool is_leaudio_broadcast_offload_session =

      (transport_->GetSessionType() ==

       SessionType::LE_AUDIO_BROADCAST_HARDWARE_OFFLOAD_ENCODING_DATAPATH);

  auto audio_config_tag = audio_config.getTag();

  bool is_software_audio_config =
@@ -215,11 +216,15 @@ bool BluetoothAudioClientInterface::UpdateAudioConfig( 
  bool is_a2dp_offload_audio_config =

      (is_a2dp_offload_session &&

       audio_config_tag == AudioConfiguration::a2dpConfig);

  bool is_leaudio_offload_audio_config =

      (is_leaudio_offload_session &&

  bool is_leaudio_unicast_offload_audio_config =

      (is_leaudio_unicast_offload_session &&

       audio_config_tag == AudioConfiguration::leAudioConfig);

  bool is_leaudio_broadcast_offload_audio_config =

      (is_leaudio_broadcast_offload_session &&

       audio_config_tag == AudioConfiguration::leAudioBroadcastConfig);

  if (!is_software_audio_config && !is_a2dp_offload_audio_config &&

      !is_leaudio_offload_audio_config) {

      !is_leaudio_unicast_offload_audio_config &&

      !is_leaudio_broadcast_offload_audio_config) {

    return false;

  }

  transport_->UpdateAudioConfiguration(audio_config);