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

Commit 16275df9 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "Unify device name types" into main am: 72e77c79 

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



Change-Id: I4248a8d76dd0162e7bfd472216775f5797ac8be3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2b9a8cc2 72e77c79

system/bta/av/bta_av_aact.cc

+2 −2
Original line number Diff line number Diff line
@@ -1196,7 +1196,7 @@ void bta_av_setconfig_rsp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
 ******************************************************************************/

void bta_av_str_opened(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {

  tBTA_AV_CONN_CHG msg;

  char remote_name[BTM_MAX_REM_BD_NAME_LEN] = "";

  char remote_name[BD_NAME_LEN] = "";

  uint8_t* p;



  log::verbose("peer {} bta_handle: 0x{:x}",
@@ -2839,7 +2839,7 @@ void bta_av_rcfg_cfm(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
  // Disable AVDTP RECONFIGURE for rejectlisted devices

  bool disable_avdtp_reconfigure = false;

  {

    char remote_name[BTM_MAX_REM_BD_NAME_LEN] = "";

    char remote_name[BD_NAME_LEN] = "";

    if (btif_storage_get_stored_remote_name(p_scb->PeerAddress(),

                                            remote_name)) {

      if (interop_match_name(INTEROP_DISABLE_AVDTP_RECONFIGURE, remote_name) ||

system/bta/dm/bta_dm_disc.cc

+3 −4
Original line number Diff line number Diff line
@@ -83,8 +83,7 @@ static void bta_dm_inq_results_cb(tBTM_INQ_RESULTS* p_inq, const uint8_t* p_eir, 
static void bta_dm_inq_cmpl(uint8_t num);

static void bta_dm_inq_cmpl_cb(void* p_result);

static void bta_dm_service_search_remname_cback(const RawAddress& bd_addr,

                                                DEV_CLASS dc,

                                                tBTM_BD_NAME bd_name);

                                                DEV_CLASS dc, BD_NAME bd_name);

static void bta_dm_remname_cback(const tBTM_REMOTE_DEV_NAME* p);

static void bta_dm_find_services(const RawAddress& bd_addr);

static void bta_dm_discover_next_device(void);
@@ -1552,7 +1551,7 @@ static void bta_dm_inq_cmpl_cb(void* p_result) { 
 ******************************************************************************/

static void bta_dm_service_search_remname_cback(const RawAddress& bd_addr,

                                                UNUSED_ATTR DEV_CLASS dc,

                                                tBTM_BD_NAME bd_name) {

                                                BD_NAME bd_name) {

  tBTM_REMOTE_DEV_NAME rem_name = {};

  tBTM_STATUS btm_status;
@@ -2502,7 +2501,7 @@ void bta_dm_search_timer_cback(void* data) { 
}



void bta_dm_service_search_remname_cback(const RawAddress& bd_addr,

                                         DEV_CLASS dc, tBTM_BD_NAME bd_name) {

                                         DEV_CLASS dc, BD_NAME bd_name) {

  ::bta_dm_service_search_remname_cback(bd_addr, dc, bd_name);

}

system/bta/dm/bta_dm_sec.cc

+8 −10
Original line number Diff line number Diff line
@@ -44,16 +44,15 @@ static tBTM_STATUS bta_dm_sp_cback(tBTM_SP_EVT event, tBTM_SP_EVT_DATA* p_data); 
static uint8_t bta_dm_ble_smp_cback(tBTM_LE_EVT event, const RawAddress& bda,

                                    tBTM_LE_EVT_DATA* p_data);

static uint8_t bta_dm_new_link_key_cback(const RawAddress& bd_addr,

                                         DEV_CLASS dev_class,

                                         tBTM_BD_NAME bd_name,

                                         DEV_CLASS dev_class, BD_NAME bd_name,

                                         const LinkKey& key, uint8_t key_type,

                                         bool is_ctkd);

static uint8_t bta_dm_pin_cback(const RawAddress& bd_addr, DEV_CLASS dev_class,

                                const tBTM_BD_NAME bd_name, bool min_16_digit);

                                const BD_NAME bd_name, bool min_16_digit);

static uint8_t bta_dm_sirk_verifiction_cback(const RawAddress& bd_addr);

static void bta_dm_authentication_complete_cback(const RawAddress& bd_addr,

                                                 DEV_CLASS dev_class,

                                                 tBTM_BD_NAME bd_name,

                                                 BD_NAME bd_name,

                                                 tHCI_REASON result);

static void bta_dm_ble_id_key_cback(uint8_t key_type,

                                    tBTM_BLE_LOCAL_KEYS* p_key);
@@ -304,7 +303,7 @@ static void bta_dm_pinname_cback(const tBTM_REMOTE_DEV_NAME* p_data) { 
 *

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

static uint8_t bta_dm_pin_cback(const RawAddress& bd_addr, DEV_CLASS dev_class,

                                const tBTM_BD_NAME bd_name, bool min_16_digit) {

                                const BD_NAME bd_name, bool min_16_digit) {

  if (!bta_dm_sec_cb.p_sec_cback) return BTM_NOT_AUTHORIZED;



  /* If the device name is not known, save bdaddr and devclass and initiate a
@@ -345,9 +344,8 @@ static uint8_t bta_dm_pin_cback(const RawAddress& bd_addr, DEV_CLASS dev_class, 
 ******************************************************************************/

static uint8_t bta_dm_new_link_key_cback(const RawAddress& bd_addr,

                                         UNUSED_ATTR DEV_CLASS dev_class,

                                         tBTM_BD_NAME bd_name,

                                         const LinkKey& key, uint8_t key_type,

                                         bool is_ctkd) {

                                         BD_NAME bd_name, const LinkKey& key,

                                         uint8_t key_type, bool is_ctkd) {

  tBTA_DM_SEC sec_event;

  tBTA_DM_AUTH_CMPL* p_auth_cmpl;

  tBTA_DM_SEC_EVT event = BTA_DM_AUTH_CMPL_EVT;
@@ -393,8 +391,8 @@ static uint8_t bta_dm_new_link_key_cback(const RawAddress& bd_addr, 
 *

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

static void bta_dm_authentication_complete_cback(

    const RawAddress& bd_addr, UNUSED_ATTR DEV_CLASS dev_class,

    tBTM_BD_NAME bd_name, tHCI_REASON reason) {

    const RawAddress& bd_addr, UNUSED_ATTR DEV_CLASS dev_class, BD_NAME bd_name,

    tHCI_REASON reason) {

  if (reason != HCI_SUCCESS) {

    if (bta_dm_sec_cb.p_sec_cback) {

      // Build out the security event data structure

system/bta/hh/bta_hh_utils.cc

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ tBTA_HH_STATUS bta_hh_read_ssr_param(const tAclLinkSpec& link_spec, 
    if (ssr_max_latency > BTA_HH_SSR_MAX_LATENCY_DEF)

      ssr_max_latency = BTA_HH_SSR_MAX_LATENCY_DEF;



    char remote_name[BTM_MAX_REM_BD_NAME_LEN] = "";

    char remote_name[BD_NAME_LEN] = "";

    if (btif_storage_get_stored_remote_name(link_spec.addrt.bda, remote_name)) {

      if (interop_match_name(INTEROP_HID_HOST_LIMIT_SNIFF_INTERVAL,

                             remote_name)) {

system/bta/test/bta_disc_test.cc

+3 −3
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ void bta_dm_sdp_result(tBTA_DM_MSG* p_data); 
void bta_dm_search_result(tBTA_DM_MSG* p_data);

void bta_dm_search_timer_cback(void* data);

void bta_dm_service_search_remname_cback(const RawAddress& bd_addr,

                                         DEV_CLASS dc, tBTM_BD_NAME bd_name);

                                         DEV_CLASS dc, BD_NAME bd_name);

void bta_dm_start_scan(uint8_t duration_sec, bool low_latency_scan = false);

void store_avrcp_profile_feature(tSDP_DISC_REC* sdp_rec);
@@ -201,7 +201,7 @@ TEST_F(BtaDiscTest, bta_dm_search_timer_cback) { 


TEST_F(BtaDiscTest, bta_dm_service_search_remname_cback__expected_name) {

  DEV_CLASS dc;

  tBTM_BD_NAME bd_name;

  BD_NAME bd_name;

  tBTA_DM_SEARCH_CB search_cb =

      bluetooth::legacy::testing::bta_dm_disc_get_search_cb();

  search_cb.peer_bdaddr = kRawAddress,
@@ -212,7 +212,7 @@ TEST_F(BtaDiscTest, bta_dm_service_search_remname_cback__expected_name) { 


TEST_F(BtaDiscTest, bta_dm_service_search_remname_cback__unexpected_name) {

  DEV_CLASS dc;

  tBTM_BD_NAME bd_name;

  BD_NAME bd_name;

  tBTA_DM_SEARCH_CB search_cb =

      bluetooth::legacy::testing::bta_dm_disc_get_search_cb();

  search_cb.peer_bdaddr = RawAddress::kAny;