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

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

Merge "bd_name_from_char_pointer: clean remaining memory" into main am: 729a42dd 

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



Change-Id: I8ad2ea301861dffd978e9d8ac068d5bce82d72eb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dafd29e9 729a42dd

system/bta/dm/bta_dm_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ void BTA_EnableTestMode(void) { 
/** This function sets the Bluetooth name of local device */

void BTA_DmSetDeviceName(const char* p_name) {

  std::vector<uint8_t> name(BD_NAME_LEN + 1);

  bd_name_copy(name.data(), p_name);

  bd_name_from_char_pointer(name.data(), p_name);



  do_in_main_thread(FROM_HERE, base::BindOnce(bta_dm_set_dev_name, name));

}

system/bta/dm/bta_dm_disc.cc

+13 −12
Original line number Diff line number Diff line
@@ -659,7 +659,8 @@ static void bta_dm_sdp_result(tBTA_DM_MSG* p_data) { 
          // send all result back to app

          tBTA_DM_SEARCH result;

          result.disc_ble_res.bd_addr = bta_dm_search_cb.peer_bdaddr;

          bd_name_copy(result.disc_ble_res.bd_name, bta_dm_get_remname());

          bd_name_from_char_pointer(result.disc_ble_res.bd_name,

                                    bta_dm_get_remname());



          result.disc_ble_res.services = &gatt_uuids;

          bta_dm_search_cb.p_search_cback(BTA_DM_GATT_OVER_SDP_RES_EVT,
@@ -795,7 +796,7 @@ static void bta_dm_sdp_result(tBTA_DM_MSG* p_data) { 
                     bta_dm_search_cb.peer_scn);

      }

      p_msg->disc_result.result.disc_res.bd_addr = bta_dm_search_cb.peer_bdaddr;

      bd_name_copy(p_msg->disc_result.result.disc_res.bd_name,

      bd_name_from_char_pointer(p_msg->disc_result.result.disc_res.bd_name,

                                bta_dm_get_remname());



      bta_sys_sendmsg(p_msg);
@@ -821,7 +822,7 @@ static void bta_dm_sdp_result(tBTA_DM_MSG* p_data) { 
    p_msg->disc_result.result.disc_res.services =

        bta_dm_search_cb.services_found;

    p_msg->disc_result.result.disc_res.bd_addr = bta_dm_search_cb.peer_bdaddr;

    bd_name_copy(p_msg->disc_result.result.disc_res.bd_name,

    bd_name_from_char_pointer(p_msg->disc_result.result.disc_res.bd_name,

                              bta_dm_get_remname());



    bta_sys_sendmsg(p_msg);
@@ -866,7 +867,7 @@ static void bta_dm_search_cmpl() { 
  std::vector<Uuid> gatt_services;

  result.disc_ble_res.services = &gatt_services;

  result.disc_ble_res.bd_addr = bta_dm_search_cb.peer_bdaddr;

  bd_name_copy(result.disc_ble_res.bd_name, bta_dm_get_remname());

  bd_name_from_char_pointer(result.disc_ble_res.bd_name, bta_dm_get_remname());



  bool send_gatt_results =

      bluetooth::common::init_flags::
@@ -1235,7 +1236,7 @@ static void bta_dm_find_services(const RawAddress& bd_addr) { 
    p_msg->disc_result.result.disc_res.services =

        bta_dm_search_cb.services_found;

    p_msg->disc_result.result.disc_res.bd_addr = bta_dm_search_cb.peer_bdaddr;

    bd_name_copy(p_msg->disc_result.result.disc_res.bd_name,

    bd_name_from_char_pointer(p_msg->disc_result.result.disc_res.bd_name,

                              bta_dm_get_remname());



    bta_sys_sendmsg(p_msg);
@@ -1441,7 +1442,7 @@ static void bta_dm_discover_device(const RawAddress& remote_bd_addr) { 
  p_msg->disc_result.result.disc_res.result = BTA_SUCCESS;

  p_msg->disc_result.result.disc_res.services = bta_dm_search_cb.services_found;

  p_msg->disc_result.result.disc_res.bd_addr = bta_dm_search_cb.peer_bdaddr;

  bd_name_copy(p_msg->disc_result.result.disc_res.bd_name,

  bd_name_from_char_pointer(p_msg->disc_result.result.disc_res.bd_name,

                            bta_dm_get_remname());



  bta_sys_sendmsg(p_msg);
@@ -1939,7 +1940,7 @@ static void bta_dm_gatt_disc_complete(uint16_t conn_id, tGATT_STATUS status) { 
  p_msg->disc_result.result.disc_res.num_uuids = 0;

  p_msg->disc_result.result.disc_res.p_uuid_list = NULL;

  p_msg->disc_result.result.disc_res.bd_addr = bta_dm_search_cb.peer_bdaddr;

  bd_name_copy(p_msg->disc_result.result.disc_res.bd_name,

  bd_name_from_char_pointer(p_msg->disc_result.result.disc_res.bd_name,

                            bta_dm_get_remname());



  p_msg->disc_result.result.disc_res.device_type |= BT_DEVICE_TYPE_BLE;

system/bta/dm/bta_dm_sec.cc

+14 −22
Original line number Diff line number Diff line
@@ -715,7 +715,6 @@ static uint8_t bta_dm_ble_smp_cback(tBTM_LE_EVT event, const RawAddress& bda, 
                                    tBTM_LE_EVT_DATA* p_data) {

  tBTM_STATUS status = BTM_SUCCESS;

  tBTA_DM_SEC sec_event;

  const char* p_name = NULL;



  log::debug("addr:{},event:{}", ADDRESS_TO_LOGGABLE_CSTR(bda),

             ble_evt_to_text(event));
@@ -734,31 +733,25 @@ static uint8_t bta_dm_ble_smp_cback(tBTM_LE_EVT event, const RawAddress& bda, 


    case BTM_LE_CONSENT_REQ_EVT:

      sec_event.ble_req.bd_addr = bda;

      p_name = get_btm_client_interface().security.BTM_SecReadDevName(bda);

      if (p_name != NULL)

        bd_name_copy(sec_event.ble_req.bd_name, p_name);

      else

        sec_event.ble_req.bd_name[0] = 0;

      bd_name_from_char_pointer(

          sec_event.ble_req.bd_name,

          get_btm_client_interface().security.BTM_SecReadDevName(bda));

      bta_dm_sec_cb.p_sec_cback(BTA_DM_BLE_CONSENT_REQ_EVT, &sec_event);

      break;



    case BTM_LE_SEC_REQUEST_EVT:

      sec_event.ble_req.bd_addr = bda;

      p_name = get_btm_client_interface().security.BTM_SecReadDevName(bda);

      if (p_name != NULL)

        bd_name_copy(sec_event.ble_req.bd_name, p_name);

      else

        sec_event.ble_req.bd_name[0] = 0;

      bd_name_from_char_pointer(

          sec_event.ble_req.bd_name,

          get_btm_client_interface().security.BTM_SecReadDevName(bda));

      bta_dm_sec_cb.p_sec_cback(BTA_DM_BLE_SEC_REQ_EVT, &sec_event);

      break;



    case BTM_LE_KEY_NOTIF_EVT:

      sec_event.key_notif.bd_addr = bda;

      p_name = get_btm_client_interface().security.BTM_SecReadDevName(bda);

      if (p_name != NULL)

        bd_name_copy(sec_event.key_notif.bd_name, p_name);

      else

        sec_event.key_notif.bd_name[0] = 0;

      bd_name_from_char_pointer(

          sec_event.key_notif.bd_name,

          get_btm_client_interface().security.BTM_SecReadDevName(bda));

      sec_event.key_notif.passkey = p_data->key_notif;

      bta_dm_sec_cb.p_sec_cback(BTA_DM_BLE_PASSKEY_NOTIF_EVT, &sec_event);

      break;
@@ -776,7 +769,8 @@ static uint8_t bta_dm_ble_smp_cback(tBTM_LE_EVT event, const RawAddress& bda, 
    case BTM_LE_NC_REQ_EVT:

      sec_event.key_notif.bd_addr = bda;

      // TODO: get rid of this

      bd_name_copy(sec_event.key_notif.bd_name, bta_dm_get_remname());

      bd_name_from_char_pointer(sec_event.key_notif.bd_name,

                                bta_dm_get_remname());

      sec_event.key_notif.passkey = p_data->key_notif;

      bta_dm_sec_cb.p_sec_cback(BTA_DM_BLE_NC_REQ_EVT, &sec_event);

      break;
@@ -805,11 +799,9 @@ static uint8_t bta_dm_ble_smp_cback(tBTM_LE_EVT event, const RawAddress& bda, 
      sec_event.auth_cmpl.bd_addr = bda;

      get_btm_client_interface().peer.BTM_ReadDevInfo(

          bda, &sec_event.auth_cmpl.dev_type, &sec_event.auth_cmpl.addr_type);

      p_name = get_btm_client_interface().security.BTM_SecReadDevName(bda);

      if (p_name != NULL)

        bd_name_copy(sec_event.auth_cmpl.bd_name, p_name);

      else

        sec_event.auth_cmpl.bd_name[0] = 0;

      bd_name_from_char_pointer(

          sec_event.auth_cmpl.bd_name,

          get_btm_client_interface().security.BTM_SecReadDevName(bda));



      if (p_data->complt.reason != HCI_SUCCESS) {

        // TODO This is not a proper use of this type

system/bta/test/bta_sec_test.cc

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ TEST_F(BtaSecTest, bta_dm_sp_cback__BTM_SP_CFM_REQ_EVT_WithName) { 
          },

  };

  data.cfm_req.dev_class = kDeviceClass;

  bd_name_copy(data.cfm_req.bd_name, kRemoteName);

  bd_name_from_char_pointer(data.cfm_req.bd_name, kRemoteName);



  ASSERT_EQ(btm_status_text(BTM_CMD_STARTED),

            btm_status_text(bluetooth::legacy::testing::bta_dm_sp_cback(
@@ -221,7 +221,7 @@ TEST_F(BtaSecTest, bta_dm_sp_cback__BTM_SP_KEY_NOTIF_EVT) { 
          },

  };

  data.key_notif.dev_class = kDeviceClass;

  bd_name_copy(data.key_notif.bd_name, kRemoteName);

  bd_name_from_char_pointer(data.key_notif.bd_name, kRemoteName);



  ASSERT_EQ(btm_status_text(BTM_CMD_STARTED),

            btm_status_text(bluetooth::legacy::testing::bta_dm_sp_cback(

system/btif/test/btif_dm_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ TEST_F_WITH_FLAGS(BtifDmWithStackTest, 
              .hci_status = HCI_SUCCESS,

          },

  };

  bd_name_copy(data.disc_res.bd_name, kBdName);

  bd_name_from_char_pointer(data.disc_res.bd_name, kBdName);



  bluetooth::legacy::testing::btif_dm_search_services_evt(BTA_DM_NAME_READ_EVT,

                                                          &data);