OSDN Git Service

Remove A2DP Source/Sink startup calls during A2DP initialization
authorPavlin Radoslavov <pavlin@google.com>
Wed, 14 Feb 2018 18:26:13 +0000 (10:26 -0800)
committerPavlin Radoslavov <pavlin@google.com>
Wed, 14 Feb 2018 18:38:22 +0000 (10:38 -0800)
Don't call btif_a2dp_source_startup() / btif_a2dp_sink_startup()
inside BtifAvSource::Init() / BtifAvSink::Init() .
Those calls are already happening at the right time later during
BtifAvSource::SetActivePeer() / BtifAvSink::SetActivePeer()

Bug: 72701090
Test: Manual with multiple headsets
Change-Id: I634a2c90a7758891565c97e86b83335608ffab69

btif/src/btif_av.cc

index d0c650e..813687a 100644 (file)
@@ -822,9 +822,6 @@ bt_status_t BtifAvSource::Init(
   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;
@@ -993,9 +990,6 @@ bt_status_t BtifAvSink::Init(btav_sink_callbacks_t* callbacks) {
                              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;