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

Commit b3e065bd authored by Patrick Liao's avatar Patrick Liao Committed by Automerger Merge Worker
Browse files

Merge "Fix sig variable not parsed yet when printing verbose log in... 

Merge "Fix sig variable not parsed yet when printing verbose log in avdt_msg_ind" into main am: c0a5bea6 am: eba61b7c

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



Change-Id: I0273fce67efbb5b545e0d70e3a0bfd7274b539db
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9396273f eba61b7c

system/stack/avdt/avdt_msg.cc

+2 −1
Original line number Diff line number Diff line
@@ -1544,7 +1544,6 @@ void avdt_msg_ind(AvdtpCcb* p_ccb, BT_HDR* p_buf) { 
  /* parse the message header */

  AVDT_MSG_PRS_HDR(p, label, pkt_type, msg_type);



  log::verbose("msg_type={}, sig={}", msg_type, sig);

  /* set up label and ccb_idx in message hdr */

  msg.hdr.label = label;

  msg.hdr.ccb_idx = avdt_ccb_to_idx(p_ccb);
@@ -1580,6 +1579,8 @@ void avdt_msg_ind(AvdtpCcb* p_ccb, BT_HDR* p_buf) { 
    }

  }



  log::verbose("msg_type={}, sig={}", msg_type, sig);



  if (ok && !gen_rej) {

    /* skip over header (msg length already verified during reassembly) */

    p_buf->len -= AVDT_LEN_TYPE_SINGLE;