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

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

Merge "Floss: Fix reconfigure L2CAP mode in receiving failure response" am:... 

Merge "Floss: Fix reconfigure L2CAP mode in receiving failure response" am: 39b6f072 am: 6b0435d0 am: e8ed7543 am: bd0e6afe am: 1e97cf89

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



Change-Id: Ie61156661b1494fdf263460e0ddbfcfa3b074ea0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 389a9fea 1e97cf89

system/stack/l2cap/l2c_fcr.cc

+5 −6
Original line number Diff line number Diff line
@@ -1727,12 +1727,11 @@ bool l2c_fcr_renegotiate_chan(tL2C_CCB* p_ccb, tL2CAP_CFG_INFO* p_cfg) { 
       * channel */

      switch (p_ccb->our_cfg.fcr.mode) {

        case L2CAP_FCR_ERTM_MODE:

          /* We can try basic for any other peer mode if we support it */

          if (p_ccb->p_rcb->ertm_info.preferred_mode & L2CAP_FCR_BASIC_MODE) {

          /* We can try basic for any other peer mode because it's always

           * supported */

          L2CAP_TRACE_DEBUG("%s(Trying Basic)", __func__);

          can_renegotiate = true;

          p_ccb->our_cfg.fcr.mode = L2CAP_FCR_BASIC_MODE;

          }

          break;



        default: