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

Commit 6e4587c8 authored by Yun-hao Chung's avatar Yun-hao Chung Committed by Automerger Merge Worker
Browse files

Merge "Fix AVDTP reconfig not setting L2CAP flushable" into main am: 8794c073 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3236120



Change-Id: Iba0801de2c1528ad9a92e85b2132b56fd23c587b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e70cbc37 8794c073

system/bta/av/bta_av_aact.cc

+16 −1
Original line number Diff line number Diff line
@@ -1176,7 +1176,8 @@ void bta_av_str_opened(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 


  /* Set the media channel as high priority */

  if (!L2CA_SetTxPriority(p_scb->l2c_cid, L2CAP_CHNL_PRIORITY_HIGH)) {

    log::warn("Unable to set L2CAP flush peer:{} cid:{}", p_scb->PeerAddress(), p_scb->l2c_cid);

    log::warn("Unable to set L2CAP Tx priority peer:{} cid:{}", p_scb->PeerAddress(),

              p_scb->l2c_cid);

  }

  if (!L2CA_SetChnlFlushability(p_scb->l2c_cid, true)) {

    log::warn("Unable to set L2CAP flush peer:{} cid:{}", p_scb->PeerAddress(), p_scb->l2c_cid);
@@ -2584,6 +2585,20 @@ void bta_av_rcfg_str_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
    p_scb->p_cos->update_mtu(p_scb->hndl, p_scb->PeerAddress(), p_scb->stream_mtu);

  }



  if (com::android::bluetooth::flags::fix_avdt_rconfig_not_setting_l2cap()) {

    /* Set the media channel as high priority */

    if (!L2CA_SetTxPriority(p_scb->l2c_cid, L2CAP_CHNL_PRIORITY_HIGH)) {

      log::warn("Unable to set L2CAP Tx priority peer:{} cid:{}", p_scb->PeerAddress(),

                p_scb->l2c_cid);

    }



    if (!L2CA_SetChnlFlushability(p_scb->l2c_cid, true)) {

      log::warn("Unable to set L2CAP flush peer:{} cid:{}", p_scb->PeerAddress(), p_scb->l2c_cid);

    }



    L2CA_SetMediaStreamChannel(p_scb->l2c_cid, true);

  }



  /* rc listen */

  bta_av_st_rc_timer(p_scb, NULL);