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

Commit fa2ae623 authored by Rongxuan Liu's avatar Rongxuan Liu Committed by Automerger Merge Worker
Browse files

Merge "Update broadcast audio configuration with stored value" into main am:... 

Merge "Update broadcast audio configuration with stored value" into main am: 0dbefb47 am: eda91cc2

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



Change-Id: I2850ffa67520b089f1bde9b5766bb2686513963b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f4c7b02b eda91cc2

system/audio_hal_interface/aidl/le_audio_software_aidl.cc

+5 −0
Original line number Diff line number Diff line
@@ -769,6 +769,11 @@ AudioConfiguration offload_config_to_hal_audio_config( 
  return AudioConfiguration(ucast_config);

}



AudioConfiguration broadcast_config_to_hal_audio_config(

        const LeAudioBroadcastConfiguration& bcast_config) {

  return AudioConfiguration(bcast_config);

}



}  // namespace le_audio

}  // namespace aidl

}  // namespace audio

system/audio_hal_interface/aidl/le_audio_software_aidl.h

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ bool hal_ucast_capability_to_stack_format(const UnicastCapability& ucast_capabil 
                                          CodecConfigSetting& stack_capability);

AudioConfiguration offload_config_to_hal_audio_config(

        const ::bluetooth::le_audio::offload_config& offload_config);

AudioConfiguration broadcast_config_to_hal_audio_config(

        const LeAudioBroadcastConfiguration& bcast_config);



bluetooth::audio::le_audio::OffloadCapabilities get_offload_capabilities();

system/audio_hal_interface/le_audio_software.cc

+3 −0
Original line number Diff line number Diff line
@@ -464,6 +464,9 @@ void LeAudioClientInterface::Sink::UpdateBroadcastAudioConfigToHal( 
  }



  get_aidl_transport_instance(is_broadcaster_)->LeAudioSetBroadcastConfig(offload_config);

  get_aidl_client_interface(is_broadcaster_)

          ->UpdateAudioConfig(aidl::le_audio::broadcast_config_to_hal_audio_config(

                  get_aidl_transport_instance(is_broadcaster_)->LeAudioGetBroadcastConfig()));

}



void LeAudioClientInterface::Sink::SuspendedForReconfiguration() {