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

Commit 8b314973 authored by Sunny Kapdi's avatar Sunny Kapdi
Browse files

BTAudio HAL: Store factory provider handle 

Ensure that the object to the factory provider is stored
in the BluetoothAudio client interface because the death
receipt would be received on that object from the AIDL
framework if the server were to crash.

Bug: 233961816
Tag: #refactor
Test: atest BluetoothInstrumentationTests
Change-Id: Id9769b13d59653d1aa4a8e5cff4edfb2b0f1276c
parent 9295f0d2

system/audio_hal_interface/aidl/client_interface_aidl.cc

+8 −4
Original line number Diff line number Diff line
@@ -134,8 +134,12 @@ void BluetoothAudioClientInterface::FetchAudioProvider() { 
  }

  CHECK(provider_ != nullptr);



  AIBinder_linkToDeath(provider_factory->asBinder().get(),

                       death_recipient_.get(), this);

  binder_status_t binder_status = AIBinder_linkToDeath(

     provider_factory->asBinder().get(), death_recipient_.get(), this);

  if (binder_status != STATUS_OK) {

    LOG(ERROR) << "Failed to linkToDeath " << static_cast<int>(binder_status);

  }

  provider_factory_ = std::move(provider_factory);



  LOG(INFO) << "IBluetoothAudioProvidersFactory::openProvider() returned "

            << provider_.get()
@@ -151,7 +155,7 @@ BluetoothAudioSinkClientInterface::BluetoothAudioSinkClientInterface( 


BluetoothAudioSinkClientInterface::~BluetoothAudioSinkClientInterface() {

  if (provider_ != nullptr) {

    AIBinder_unlinkToDeath(provider_->asBinder().get(), death_recipient_.get(),

    AIBinder_unlinkToDeath(provider_factory_->asBinder().get(), death_recipient_.get(),

                           nullptr);

  }

}
@@ -165,7 +169,7 @@ BluetoothAudioSourceClientInterface::BluetoothAudioSourceClientInterface( 


BluetoothAudioSourceClientInterface::~BluetoothAudioSourceClientInterface() {

  if (provider_ != nullptr) {

    AIBinder_unlinkToDeath(provider_->asBinder().get(), death_recipient_.get(),

    AIBinder_unlinkToDeath(provider_factory_->asBinder().get(), death_recipient_.get(),

                           nullptr);

  }

}

system/audio_hal_interface/aidl/client_interface_aidl.h

+2 −0
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ class BluetoothAudioClientInterface { 


  std::shared_ptr<IBluetoothAudioProvider> provider_;



  std::shared_ptr<IBluetoothAudioProviderFactory> provider_factory_;



  bool session_started_;

  std::unique_ptr<DataMQ> data_mq_;