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

Commit eb1580e3 authored by Sandeep Samdaria's avatar Sandeep Samdaria Committed by Automerger Merge Worker
Browse files

Merge "Parse the headers before profile id extraction" into main am: 838d2564 

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



Change-Id: Iaa440c80270b2acf3bbd76d63a08e57f74275c95
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b8f3c84d 838d2564

system/stack/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ cc_library_static { 
        "pan/pan_utils.cc",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_hci_pdl",

        "libbluetooth_log",
@@ -597,7 +598,11 @@ cc_fuzz { 
        "avrc/*.cc",

        "fuzzers/avrc_fuzzer.cc",

    ],

    shared_libs: [

        "server_configurable_flags",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "libbase",

        "libbluetooth-types",

        "libbluetooth_hci_pdl",

system/stack/avct/avct_lcb_act.cc

+5 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
 *  This module contains action functions of the link control state machine.

 *

 ******************************************************************************/

#include <android_bluetooth_flags.h>

#include <android_bluetooth_sysprop.h>

#include <bluetooth/log.h>

#include <string.h>
@@ -718,9 +719,12 @@ bool avct_msg_ind_for_src_sink_coexist(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data, 
  tAVCT_CCB* p_ccb;

  int p_buf_len;

  uint8_t* p;

  uint16_t pid;

  uint16_t pid, type;



  p = (uint8_t*)(p_data->p_buf + 1) + p_data->p_buf->offset;

  if (IS_FLAG_ENABLED(a2dp_concurrent_source_sink)) {

    AVCT_PARSE_HDR(p, label, type, cr_ipid);

  }



  BE_STREAM_TO_UINT16(pid, p);