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

Commit 930a9148 authored by DC Xu's avatar DC Xu Committed by Automerger Merge Worker
Browse files

Merge "Modify log level for exceptional return branches in... 

Merge "Modify log level for exceptional return branches in l2c_link_check_send_pkts()" into main am: c3e73433

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



Change-Id: I85a5bee3e2c6aae0709e29bb1edc4f68c1ad093e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8f35e05a c3e73433

system/stack/l2cap/l2c_link.cc

+4 −3
Original line number Diff line number Diff line
@@ -828,7 +828,7 @@ void l2c_link_check_send_pkts(tL2C_LCB* p_lcb, uint16_t local_cid, 
   ** This LCB will be served when receiving number of completed packet event.

   */

  if (l2cb.is_cong_cback_context) {

    log::info("skipping, is_cong_cback_context=true");

    log::warn("skipping, is_cong_cback_context=true");

    return;

  }
@@ -900,10 +900,11 @@ void l2c_link_check_send_pkts(tL2C_LCB* p_lcb, uint16_t local_cid, 
      l2cb.ble_check_round_robin = false;

  } else /* if this is not round-robin service */

  {

    /* If a partial segment is being sent, can't send anything else */

    /* link_state or power mode not ready, can't send anything else */

    if ((p_lcb->link_state != LST_CONNECTED) ||

        (l2c_link_check_power_mode(p_lcb))) {

      log::info("A partial segment is being sent, cannot send anything else");

      log::warn("Can't send, link state: {} not LST_CONNECTED or power mode BTM_PM_STS_PENDING",

                p_lcb->link_state);

      return;

    }

    log::verbose(