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

Commit 1f1282e0 authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Łukasz Rymanowski (xWF)
Browse files

l2cap: Fix setting FCS Option 

As per BT Core specification, FCS option shall be preset if ERTM or
Streaming mode is used and peer supports it.

Since Android supports FCS option, lets set it here, and later, code
will check if peer supports it as well in: l2cu_process_our_cfg_req()

Bug: 371947246
Bug: 372605959
Test: manual PTS test case
Test: mmm packages/modules/Bluetooth
Flag: com::android::bluetooth::flags::l2cap_fcs_option_fix

Change-Id: I5a2333207a9b27c1253aa4e33ca06389a68655ec
parent a98ebb03

system/stack/l2cap/l2c_csm.cc

+8 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 


#include <base/functional/callback.h>

#include <bluetooth/log.h>

#include <com_android_bluetooth_flags.h>

#include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>



#include <string>
@@ -74,6 +75,13 @@ static void l2c_csm_send_config_req(tL2C_CCB* p_ccb) { 
  if (p_ccb->p_rcb->ertm_info.preferred_mode != L2CAP_FCR_BASIC_MODE) {

    config.fcr_present = true;

    config.fcr = kDefaultErtmOptions;



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

      /* Later l2cu_process_our_cfg_req() will check if remote supports it, and if not, it will be

       * cleared as per spec. */

      config.fcs_present = true;

      config.fcs = 1;

    }

  }

  p_ccb->our_cfg = config;

  l2c_csm_execute(p_ccb, L2CEVT_L2CA_CONFIG_REQ, &config);