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

Commit 649903f2 authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge Android R QPR1 

Bug: 172690556
Merged-In: Ibf87b4db0c49db9f489b2937bff9691258f71e16
Change-Id: Ied5bcebdcd24b61fd49e29f6b894b56b08909327
parents 5e1b139f 2cef12eb

system/device/include/interop_database.h

+6 −0
Original line number Diff line number Diff line
@@ -151,11 +151,17 @@ static const interop_addr_entry_t interop_addr_database[] = { 
    // because BR/EDR address and ADV random address are the same

    {{{0xd4, 0x7a, 0xe2, 0, 0, 0}}, 3, INTEROP_DISABLE_NAME_REQUEST},



    // Mazda Carkit

    {{{0xfc, 0x35, 0xe6, 0, 0, 0}}, 3, INTEROP_AVRCP_1_4_ONLY},



    // Toyota Car Audio

    {{{0x00, 0x17, 0x53, 0, 0, 0}}, 3, INTEROP_AVRCP_1_4_ONLY},



    // Honda High End Carkit

    {{{0x9c, 0x8d, 0x7c, 0, 0, 0}}, 3, INTEROP_AVRCP_1_4_ONLY},



    // Honda Civic Carkit

    {{{0x0c, 0xd9, 0xc1, 0, 0, 0}}, 3, INTEROP_AVRCP_1_4_ONLY},

};



typedef struct {

system/stack/Android.bp

+33 −0
Original line number Diff line number Diff line
@@ -486,6 +486,39 @@ cc_test { 
    },

}



cc_test {

    name: "net_test_stack_a2dp_native",

    defaults: ["fluoride_defaults"],

    test_suites: ["device-tests"],

    host_supported: true,

    include_dirs: [

        "external/libldac/inc",

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system/stack/include",

    ],

    srcs: [

        "test/a2dp/a2dp_vendor_ldac_decoder_test.cc",

        "test/a2dp/misc_fake.cc",

    ],

    shared_libs: [

        "libcrypto",

        "libcutils",

        "libprotobuf-cpp-lite",

    ],

    static_libs: [

        "libbt-common",

        "libbt-protos-lite",

        "liblog",

        "libosi",

        "libosi-AllocationTestHarness",

    ],

    sanitize: {

        address: true,

        cfi: true,

        misc_undefined: ["bounds"],

    },

}



// gatt sr hash test

cc_test {

    name: "net_test_stack_gatt_sr_hash_native",

system/stack/avrc/avrc_pars_tg.cc

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ static tAVRC_STS avrc_ctrl_pars_vendor_cmd(tAVRC_MSG_VENDOR* p_msg, 
      break;

    }

    case AVRC_PDU_REGISTER_NOTIFICATION: /* 0x31 */

      if (len < 5) return AVRC_STS_INTERNAL_ERR;



      BE_STREAM_TO_UINT8(p_result->reg_notif.event_id, p);

      BE_STREAM_TO_UINT32(p_result->reg_notif.param, p);

      break;

system/stack/btm/btm_sec.cc

+7 −0
Original line number Diff line number Diff line
@@ -2394,6 +2394,13 @@ void btm_sec_rmt_host_support_feat_evt(uint8_t* p) { 
 *

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

void btm_io_capabilities_req(const RawAddress& p) {

  if (btm_sec_is_a_bonded_dev(p)) {

    BTM_TRACE_WARNING(

        "%s: Incoming bond request, but %s is already bonded (removing)",

        __func__, p.ToString().c_str());

    bta_dm_process_remove_device(p);

  }



  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_or_alloc_dev(p);



  if ((btm_cb.security_mode == BTM_SEC_MODE_SC) &&

system/stack/sdp/sdp_server.cc

+4 −0
Original line number Diff line number Diff line
@@ -116,9 +116,11 @@ void sdp_server_handle_client_req(tCONN_CB* p_ccb, BT_HDR* p_msg) { 


  if (p_req + sizeof(pdu_id) + sizeof(trans_num) > p_req_end) {

    android_errorWriteLog(0x534e4554, "69384124");

    android_errorWriteLog(0x534e4554, "169342531");

    trans_num = 0;

    sdpu_build_n_send_error(p_ccb, trans_num, SDP_INVALID_REQ_SYNTAX,

                            SDP_TEXT_BAD_HEADER);

    return;

  }



  /* The first byte in the message is the pdu type */
@@ -129,8 +131,10 @@ void sdp_server_handle_client_req(tCONN_CB* p_ccb, BT_HDR* p_msg) { 


  if (p_req + sizeof(param_len) > p_req_end) {

    android_errorWriteLog(0x534e4554, "69384124");

    android_errorWriteLog(0x534e4554, "169342531");

    sdpu_build_n_send_error(p_ccb, trans_num, SDP_INVALID_REQ_SYNTAX,

                            SDP_TEXT_BAD_HEADER);

    return;

  }



  BE_STREAM_TO_UINT16(param_len, p_req);