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

Commit e040b747 authored by Jakub Tyszkowski's avatar Jakub Tyszkowski
Browse files

LeAudio: Fix redundant audio hal stop 

Trivial change - moved calling StopSession() on self from Cleanup()
method, to the parent object before it calls this Cleanup().
The parent tracks the interface state, so it calls StopSession() only
when it is actually running.

This fixes the additional StopSession from Cleanup() on the non-started interface:
 luetooth: packages/modules/Bluetooth/system/bta/le_audio/audio_hal_client/audio_source_hal_client.cc:362 - Stop:
 bt_stack: [INFO:le_audio_software.cc(313)] StopSession sink
 BTAudioClientLeAudioStub: packages/modules/Bluetooth/system/audio_hal_interface/le_audio_software.cc:103 - Cleanup: HAL transport: 0x01, is broadcast: 0
 t_stack: [INFO:le_audio_software.cc(313)] StopSession sink

Bug: 320275987
Test: m com.android.btservices; tested manually
Flag: EXEMPT; trivial change
Change-Id: I1e29d42fb1933470625964772b24a1d404a7aca6
parent 211d4783

system/audio_hal_interface/le_audio_software.cc

+0 −3
Original line number Diff line number Diff line
@@ -106,8 +106,6 @@ void LeAudioClientInterface::Sink::Cleanup() { 
            static_cast<int>(HalVersionManager::GetHalTransport()),

            is_broadcaster_);



  StopSession();



  /* Cleanup transport interface and instance according to type and role */

  if (HalVersionManager::GetHalTransport() ==

      BluetoothAudioHalTransport::HIDL) {
@@ -466,7 +464,6 @@ size_t LeAudioClientInterface::Sink::Read(uint8_t* p_buf, uint32_t len) { 


void LeAudioClientInterface::Source::Cleanup() {

  log::info("source");

  StopSession();

  if (hidl::le_audio::LeAudioSourceTransport::interface) {

    delete hidl::le_audio::LeAudioSourceTransport::interface;

    hidl::le_audio::LeAudioSourceTransport::interface = nullptr;

system/bta/le_audio/audio_hal_client/audio_sink_hal_client.cc

+5 −0
Original line number Diff line number Diff line
@@ -106,6 +106,11 @@ void SinkImpl::Release() { 


  log::info("");

  if (halSourceInterface_) {

    if (le_audio_source_hal_state == HAL_STARTED) {

      halSourceInterface_->StopSession();

      le_audio_source_hal_state = HAL_STOPPED;

    }



    halSourceInterface_->Cleanup();



    auto halInterface = audio::le_audio::LeAudioClientInterface::Get();

system/bta/le_audio/audio_hal_client/audio_source_hal_client.cc

+5 −0
Original line number Diff line number Diff line
@@ -148,6 +148,11 @@ void SourceImpl::Release() { 
  worker_thread_->ShutDown();



  if (halSinkInterface_) {

    if (le_audio_sink_hal_state_ == HAL_STARTED) {

      halSinkInterface_->StopSession();

      le_audio_sink_hal_state_ = HAL_STOPPED;

    }



    halSinkInterface_->Cleanup();



    auto halInterface = audio::le_audio::LeAudioClientInterface::Get();