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

Commit f3780311 authored by Jeremy Wu's avatar Jeremy Wu Committed by Automerger Merge Worker
Browse files

Merge "Floss: update debug logs in |sco_pkt_read_ptr|" into main am: 6e7c2c89 

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



Change-Id: I3c5e2504d8292fe0a556b80f546a044dcbae89a6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6cc8ed0b 6e7c2c89

system/stack/btm/btm_sco_hci.cc

+8 −4
Original line number Diff line number Diff line
@@ -565,6 +565,10 @@ struct tBTM_MSBC_INFO { 


  size_t write(const std::vector<uint8_t>& input) {

    if (input.size() > decode_buf_avail_len()) {

      log::warn(

          "Cannot write input with size {} into decode_buf with {} empty "

          "space.",

          input.size(), decode_buf_avail_len());

      return 0;

    }
@@ -656,8 +660,6 @@ struct tBTM_MSBC_INFO { 


  const uint8_t* sco_pkt_read_ptr() {

    if (encode_buf_wo - encode_buf_ro < packet_size) {

      log::debug("Insufficient data to dequeue. buf_wo:{}, buf_ro:{}",

                 encode_buf_wo, encode_buf_ro);

      return nullptr;

    }
@@ -959,6 +961,10 @@ struct tBTM_LC3_INFO { 


  size_t write(const std::vector<uint8_t>& input) {

    if (input.size() > buf_size - decode_buf_wo) {

      log::warn(

          "Cannot write input with size {} into decode_buf with {} empty "

          "space.",

          input.size(), buf_size - decode_buf_wo);

      return 0;

    }
@@ -1007,8 +1013,6 @@ struct tBTM_LC3_INFO { 


  const uint8_t* sco_pkt_read_ptr() {

    if (encode_buf_wo - encode_buf_ro < packet_size) {

      log::debug("Insufficient data to dequeue. buf_wo:{}, buf_ro:{}",

                 encode_buf_wo, encode_buf_ro);

      return nullptr;

    }