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

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

Merge "BtAudio: Prevent unlink dead binder" am: dc1a419b am: 6afd301d am: 31a6eb81 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2046266



Change-Id: I3f0ad7c0c535bd1312871e1b53bc2cf0597a2434
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ebd891dc 31a6eb81

bluetooth/audio/aidl/default/BluetoothAudioProvider.cpp

+6 −2
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ ndk::ScopedAStatus BluetoothAudioProvider::startSession( 
  latency_modes_ = latencyModes;

  audio_config_ = std::make_unique<AudioConfiguration>(audio_config);

  stack_iface_ = host_if;

  is_binder_died = false;



  AIBinder_linkToDeath(stack_iface_->asBinder().get(), death_recipient_.get(),

                       this);
@@ -59,8 +60,10 @@ ndk::ScopedAStatus BluetoothAudioProvider::endSession() { 
  if (stack_iface_ != nullptr) {

    BluetoothAudioSessionReport::OnSessionEnded(session_type_);



    if (!is_binder_died) {

      AIBinder_unlinkToDeath(stack_iface_->asBinder().get(),

                             death_recipient_.get(), this);

    }

  } else {

    LOG(INFO) << __func__ << " - SessionType=" << toString(session_type_)

              << " has NO session";
@@ -147,6 +150,7 @@ void BluetoothAudioProvider::binderDiedCallbackAidl(void* ptr) { 
    LOG(ERROR) << __func__ << ": Null AudioProvider HAL died";

    return;

  }

  provider->is_binder_died = true;

  provider->endSession();

}

bluetooth/audio/aidl/default/BluetoothAudioProvider.h

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ class BluetoothAudioProvider : public BnBluetoothAudioProvider { 
  std::unique_ptr<AudioConfiguration> audio_config_ = nullptr;

  SessionType session_type_;

  std::vector<LatencyMode> latency_modes_;

  bool is_binder_died = false;

};



}  // namespace audio