commit ab4453774e9b8b5c87c9d3da5a84145cf0f43540
author weichinweng <weichinweng@google.com> Wed Oct 03 15:08:54 2018 +0800
committer Hansong Zhang <hsz@google.com> Tue Oct 09 21:24:35 2018 +0000
tree 98c224057b074bb665bb69bbf87bcc3e33d9829f
parent 06036bf60d8d976b803b4a849fa6228262d98d2d

Stop A2DP stream when shutting down A2DP source.

When shutting down a2dp source,
A2DP source set StateShuttingDown state too fast cause the A2DP doesn’t stop stream.
Will try to stop A2DP when doing A2DP source end session.

Bug: 116317072
Bug: 112279820
Test: Build Pass, BT off/on when play A2DP
Change-Id: I6bfb5c235da1ff4a7e6814bae3a98ae7dd1788aa
(cherry picked from commit cdcdca546f533b55a697abd4cedafec14fb2ff6a)

btif/src/btif_a2dp_source.cc

diff --git a/btif/src/btif_a2dp_source.cc b/btif/src/btif_a2dp_source.cc
index efd842b..78e5a4e 100644
--- a/btif/src/btif_a2dp_source.cc
+++ b/btif/src/btif_a2dp_source.cc
@@ -529,7 +529,8 @@
     BluetoothMetricsLogger::GetInstance()->LogBluetoothSessionEnd(
         system_bt_osi::DISCONNECT_REASON_UNKNOWN, 0);
   }
-  if (btif_a2dp_source_cb.State() == BtifA2dpSource::kStateRunning) {
+  if ((btif_a2dp_source_cb.State() == BtifA2dpSource::kStateRunning) ||
+      (btif_a2dp_source_cb.State() == BtifA2dpSource::kStateShuttingDown)) {
     btif_av_stream_stop(peer_address);
   } else {
     LOG_ERROR(LOG_TAG, "%s: A2DP Source media task is not running", __func__);