commit 7054e598f4efa6f7c5c8a3f8f2f03dc4cb7826a4
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 24 19:31:02 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 24 19:31:02 2020 +0000
tree 3be21c890e05abb1e16ae5505e7cefd8595bee8f
parent de2a89048025684eac3ffff2092d12897f3ef290
parent 3c1ec94cd08ffb20682ed69ec0ad24ff0b24c952

Merge "BTAudio: report session ended after cleaning up" am: 5ae008679d am: 5373028c3c am: 3c1ec94cd0

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

Change-Id: Ib93c49b8caaba44ec5fc73f07db17ce85fb03501

bluetooth/audio/2.0/default/session/BluetoothAudioSession.cpp

diff --git a/bluetooth/audio/2.0/default/session/BluetoothAudioSession.cpp b/bluetooth/audio/2.0/default/session/BluetoothAudioSession.cpp
index d60e732..50119bf 100644
--- a/bluetooth/audio/2.0/default/session/BluetoothAudioSession.cpp
+++ b/bluetooth/audio/2.0/default/session/BluetoothAudioSession.cpp
@@ -90,14 +90,16 @@
 // bluetooth_audio outputs
 void BluetoothAudioSession::OnSessionEnded() {
   std::lock_guard<std::recursive_mutex> guard(mutex_);
-  if (IsSessionReady()) {
-    ReportSessionStatus();
-  }
+  bool toggled = IsSessionReady();
+  LOG(INFO) << __func__ << " - SessionType=" << toString(session_type_);
   audio_config_ = (session_type_ == SessionType::A2DP_HARDWARE_OFFLOAD_DATAPATH
                        ? kInvalidOffloadAudioConfiguration
                        : kInvalidSoftwareAudioConfiguration);
   stack_iface_ = nullptr;
   UpdateDataPath(nullptr);
+  if (toggled) {
+    ReportSessionStatus();
+  }
 }
 
 // invoking the registered session_changed_cb_