Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cda3f1b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Open acceptor channel for RC on cleanup"

parents 3c7ae5c4 aeae74ce

system/bta/av/bta_av_act.cc

+3 −5
Original line number Diff line number Diff line
@@ -1878,11 +1878,6 @@ void bta_av_rc_closed(tBTA_AV_DATA* p_data) { 
      } else {

        /* AVCT CCB is still there. dealloc */

        bta_av_del_rc(p_rcb);



        /* if the AVRCP is no longer listening, create the listening channel */

        if (bta_av_cb.rc_acp_handle == BTA_AV_RC_HANDLE_NONE &&

            bta_av_cb.features & BTA_AV_FEAT_RCTG)

          bta_av_rc_create(&bta_av_cb, AVCT_ACP, 0, BTA_AV_NUM_LINKS + 1);

      }

    } else if ((p_rcb->handle != BTA_AV_RC_HANDLE_NONE) &&

               (p_rcb->status & BTA_AV_RC_CONN_MASK)) {
@@ -1903,6 +1898,9 @@ void bta_av_rc_closed(tBTA_AV_DATA* p_data) { 
  tBTA_AV bta_av_data;

  bta_av_data.rc_close = rc_close;

  (*p_cb->p_cback)(BTA_AV_RC_CLOSE_EVT, &bta_av_data);

  if (bta_av_cb.rc_acp_handle == BTA_AV_RC_HANDLE_NONE

                  && bta_av_cb.features & BTA_AV_FEAT_RCTG)

      bta_av_rc_create(&bta_av_cb, AVCT_ACP, 0, BTA_AV_NUM_LINKS + 1);

}



/*******************************************************************************