commit aa9e4a6e51ab80c90771273eba092f01fd382a28
author Andre Eisenbach <eisenbach@google.com> Wed Feb 21 02:38:52 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Feb 21 20:00:30 2018 +0000
tree 96a24dcc64c1dff1704974a967df7acfce3193c4
parent 02a80aa4b9c5dc02f20ded5b12a7576b0daf9a73

Revert "Remove A2DP Source/Sink startup calls during A2DP initialization"

This reverts commit 83255478b0457f291d6a78795444ff3b895d4a90.

Reason for revert:
Prevents audio routing due to stale active device record if
Bluetooth is toggled without the process stopping completely
(ex. LE-only mode).

Bug: 72701090
Change-Id: Ifa798e63df14855b5bf0bd45e1557315cd51034d
Fixes: 73601288
(cherry picked from commit 57bb0b493470c09ff2bdbf78a2e80070c827e35c)

btif/src/btif_av.cc

diff --git a/btif/src/btif_av.cc b/btif/src/btif_av.cc
index 813687a..d0c650e 100644
--- a/btif/src/btif_av.cc
+++ b/btif/src/btif_av.cc
@@ -822,6 +822,9 @@
   codec_priorities_ = codec_priorities;
   bta_av_co_init(codec_priorities_);
 
+  if (!btif_a2dp_source_startup()) {
+    return BT_STATUS_FAIL;  // Already running
+  }
   btif_enable_service(BTA_A2DP_SOURCE_SERVICE_ID);
   enabled_ = true;
   return BT_STATUS_SUCCESS;
@@ -990,6 +993,9 @@
                              kDefaultMaxConnectedAudioDevices);
   callbacks_ = callbacks;
 
+  if (!btif_a2dp_sink_startup()) {
+    return BT_STATUS_FAIL;  // Already running
+  }
   btif_enable_service(BTA_A2DP_SINK_SERVICE_ID);
   enabled_ = true;
   return BT_STATUS_SUCCESS;