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

Commit 9b2b1f65 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7110204 from 35f8d526 to sc-release 

Change-Id: If2798a961bfba2b0690810356af095480498df62
parents 1c15e68a 35f8d526

system/main/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ cc_library_shared { 
        "android.hardware.bluetooth.audio@2.0",

        "android.hardware.bluetooth.audio@2.0",

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

        "android.hardware.bluetooth@1.1",

        "android.system.suspend.control-ndk",

        "android.system.suspend.control-V1-ndk",

        "libaaudio",

        "libaaudio",

        "libbinder_ndk",

        "libbinder_ndk",

        "libcrypto",

        "libcrypto",

system/stack/l2cap/l2c_csm.cc

+1 −0
Original line number Original line Diff line number Diff line
@@ -66,6 +66,7 @@ static void l2c_csm_send_config_req(tL2C_CCB* p_ccb) { 
  tL2CAP_CFG_INFO config{};

  tL2CAP_CFG_INFO config{};

  config.mtu_present = true;

  config.mtu_present = true;

  config.mtu = p_ccb->p_rcb->my_mtu;

  config.mtu = p_ccb->p_rcb->my_mtu;

  p_ccb->max_rx_mtu = config.mtu;

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

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

    config.fcr_present = true;

    config.fcr_present = true;

    config.fcr = kDefaultErtmOptions;

    config.fcr = kDefaultErtmOptions;

system/stack/l2cap/l2c_fcr.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -1193,7 +1193,7 @@ static bool do_sar_reassembly(tL2C_CCB* p_ccb, BT_HDR* p_buf, 




      if (p_fcrb->rx_sdu_len > p_ccb->max_rx_mtu) {

      if (p_fcrb->rx_sdu_len > p_ccb->max_rx_mtu) {

        L2CAP_TRACE_WARNING("SAR - SDU len: %u  larger than MTU: %u",

        L2CAP_TRACE_WARNING("SAR - SDU len: %u  larger than MTU: %u",

                            p_fcrb->rx_sdu_len, p_fcrb->rx_sdu_len);

                            p_fcrb->rx_sdu_len, p_ccb->max_rx_mtu);

        packet_ok = false;

        packet_ok = false;

      } else {

      } else {

        p_fcrb->p_rx_sdu = (BT_HDR*)osi_malloc(

        p_fcrb->p_rx_sdu = (BT_HDR*)osi_malloc(