Merge "Do not cleanup offload related flag in bta_av_conn_cback" into sc-qpr1-dev

[android-x86/system-bt.git] / bta / av / bta_av_main.cc

diff --git a/bta/av/bta_av_main.cc b/bta/av/bta_av_main.cc
index e1d0508..e3b500d 100644 (file)
--- a/bta/av/bta_av_main.cc
+++ b/bta/av/bta_av_main.cc
@@ -164,8 +164,8 @@ static void bta_av_api_enable(tBTA_AV_DATA* p_data) {
   /* store parameters */
   bta_av_cb.p_cback = p_data->api_enable.p_cback;
   bta_av_cb.features = p_data->api_enable.features;
-  bta_av_cb.offload_start_pending_acl_hdl = HCI_INVALID_HANDLE;
-  bta_av_cb.offload_started_acl_hdl = HCI_INVALID_HANDLE;
+  bta_av_cb.offload_start_pending_hndl = 0;
+  bta_av_cb.offload_started_hndl = 0;
 
   tBTA_AV_ENABLE enable;
   enable.features = bta_av_cb.features;
@@ -338,16 +338,6 @@ void bta_av_conn_cback(UNUSED_ATTR uint8_t handle, const RawAddress& bd_addr,
     evt = BTA_AV_SIG_CHG_EVT;
     if (event == AVDT_DISCONNECT_IND_EVT) {
       p_scb = bta_av_addr_to_scb(bd_addr);
-      if (p_scb) {
-        uint16_t handle =
-            BTM_GetHCIConnHandle(p_scb->PeerAddress(), BT_TRANSPORT_BR_EDR);
-        if (bta_av_cb.offload_started_acl_hdl == handle ||
-            bta_av_cb.offload_start_pending_acl_hdl == handle) {
-          LOG_INFO("%s: Cleanup offload related flag", __func__);
-          bta_av_cb.offload_started_acl_hdl = HCI_INVALID_HANDLE;
-          bta_av_cb.offload_start_pending_acl_hdl = HCI_INVALID_HANDLE;
-        }
-      }
     } else if (event == AVDT_CONNECT_IND_EVT) {
       APPL_TRACE_DEBUG("%s: CONN_IND is ACP:%d", __func__,
                        p_data->hdr.err_param);
@@ -1420,9 +1410,9 @@ void bta_debug_av_dump(int fd) {
   dprintf(fd, "  Registered audio channels mask: 0x%x\n", bta_av_cb.reg_audio);
   dprintf(fd, "  Connected LCBs mask: 0x%x\n", bta_av_cb.conn_lcb);
   dprintf(fd, "  Offload start pending handle: %d\n",
-          bta_av_cb.offload_start_pending_acl_hdl);
+          bta_av_cb.offload_start_pending_hndl);
   dprintf(fd, "  Offload started handle: %d\n",
-          bta_av_cb.offload_started_acl_hdl);
+          bta_av_cb.offload_started_hndl);
 
   for (size_t i = 0; i < sizeof(bta_av_cb.lcb) / sizeof(bta_av_cb.lcb[0]);
        i++) {