diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-04-07 20:32:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-07 20:32:30 +0000 |
| commit | d667e6583ec49d3ef709d6b18571cbcfd2a97bc7 (patch) | |
| tree | 99a5daeee2028b465630456bc778fc3454f65406 | |
| parent | ebd891dca12802076adec919798e305f945a099c (diff) | |
| parent | 31a6eb814ca9546c15f86c8de6f509f2381da7e9 (diff) | |
Merge "BtAudio: Prevent unlink dead binder" am: dc1a419baf am: 6afd301d16 am: 31a6eb814c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2046266
Change-Id: I3f0ad7c0c535bd1312871e1b53bc2cf0597a2434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | bluetooth/audio/aidl/default/BluetoothAudioProvider.cpp | 8 | ||||
| -rw-r--r-- | bluetooth/audio/aidl/default/BluetoothAudioProvider.h | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/bluetooth/audio/aidl/default/BluetoothAudioProvider.cpp b/bluetooth/audio/aidl/default/BluetoothAudioProvider.cpp index 0dd814828c..2a88959af5 100644 --- a/bluetooth/audio/aidl/default/BluetoothAudioProvider.cpp +++ b/bluetooth/audio/aidl/default/BluetoothAudioProvider.cpp @@ -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_); - AIBinder_unlinkToDeath(stack_iface_->asBinder().get(), - death_recipient_.get(), this); + 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(); } diff --git a/bluetooth/audio/aidl/default/BluetoothAudioProvider.h b/bluetooth/audio/aidl/default/BluetoothAudioProvider.h index a9f830af78..dbfff7d26c 100644 --- a/bluetooth/audio/aidl/default/BluetoothAudioProvider.h +++ b/bluetooth/audio/aidl/default/BluetoothAudioProvider.h @@ -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 |