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

Commit c042dfe2 authored by Rahul Arya's avatar Rahul Arya Committed by Automerger Merge Worker
Browse files

Merge "Minimal fix for SDP crash" into tm-d1-dev am: 452356d7 

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



Change-Id: I0df9fb784a5e9f1e7823a688f9190bdd2d9060dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cc82a18e 452356d7

system/bta/dm/bta_dm_act.cc

+15 −7
Original line number Original line Diff line number Diff line
@@ -1879,10 +1879,9 @@ static void bta_dm_service_search_remname_cback(const RawAddress& bd_addr, 




  APPL_TRACE_DEBUG("%s name=<%s>", __func__, bd_name);

  APPL_TRACE_DEBUG("%s name=<%s>", __func__, bd_name);





  rem_name.bd_addr = bd_addr;



  /* if this is what we are looking for */

  /* if this is what we are looking for */

  if (bta_dm_search_cb.peer_bdaddr == bd_addr) {

  if (bta_dm_search_cb.peer_bdaddr == bd_addr) {

    rem_name.bd_addr = bd_addr;

    rem_name.length = strlcpy((char*)rem_name.remote_bd_name, (char*)bd_name,

    rem_name.length = strlcpy((char*)rem_name.remote_bd_name, (char*)bd_name,

                              BD_NAME_LEN + 1);

                              BD_NAME_LEN + 1);

    if (rem_name.length > BD_NAME_LEN) {

    if (rem_name.length > BD_NAME_LEN) {
@@ -1904,6 +1903,9 @@ static void bta_dm_service_search_remname_cback(const RawAddress& bd_addr, 
      APPL_TRACE_WARNING("%s: BTM_ReadRemoteDeviceName returns 0x%02X",

      APPL_TRACE_WARNING("%s: BTM_ReadRemoteDeviceName returns 0x%02X",

                         __func__, btm_status);

                         __func__, btm_status);





      // needed so our response is not ignored, since this corresponds to the

      // actual peer_bdaddr

      rem_name.bd_addr = bta_dm_search_cb.peer_bdaddr;

      rem_name.length = 0;

      rem_name.length = 0;

      rem_name.remote_bd_name[0] = 0;

      rem_name.remote_bd_name[0] = 0;

      rem_name.status = btm_status;

      rem_name.status = btm_status;
@@ -1926,11 +1928,6 @@ static void bta_dm_remname_cback(void* p) { 
  APPL_TRACE_DEBUG("bta_dm_remname_cback len = %d name=<%s>",

  APPL_TRACE_DEBUG("bta_dm_remname_cback len = %d name=<%s>",

                   p_remote_name->length, p_remote_name->remote_bd_name);

                   p_remote_name->length, p_remote_name->remote_bd_name);





  /* remote name discovery is done but it could be failed */

  bta_dm_search_cb.name_discover_done = true;

  strlcpy((char*)bta_dm_search_cb.peer_name,

          (char*)p_remote_name->remote_bd_name, BD_NAME_LEN + 1);



  if (bta_dm_search_cb.peer_bdaddr == p_remote_name->bd_addr) {

  if (bta_dm_search_cb.peer_bdaddr == p_remote_name->bd_addr) {

    if (bluetooth::shim::is_gd_security_enabled()) {

    if (bluetooth::shim::is_gd_security_enabled()) {

      bluetooth::shim::BTM_SecDeleteRmtNameNotifyCallback(

      bluetooth::shim::BTM_SecDeleteRmtNameNotifyCallback(
@@ -1938,8 +1935,19 @@ static void bta_dm_remname_cback(void* p) { 
    } else {

    } else {

      BTM_SecDeleteRmtNameNotifyCallback(&bta_dm_service_search_remname_cback);

      BTM_SecDeleteRmtNameNotifyCallback(&bta_dm_service_search_remname_cback);

    }

    }

  } else {

    // if we got a different response, ignore it

    // we will have made a request directly from BTM_ReadRemoteDeviceName so we

    // expect a dedicated response for us

    LOG_INFO("ignoring remote name response in DM callback since it's for the wrong bd_addr");

    return;

  }

  }





  /* remote name discovery is done but it could be failed */

  bta_dm_search_cb.name_discover_done = true;

  strlcpy((char*)bta_dm_search_cb.peer_name,

          (char*)p_remote_name->remote_bd_name, BD_NAME_LEN + 1);



  if (bta_dm_search_cb.transport == BT_TRANSPORT_LE) {

  if (bta_dm_search_cb.transport == BT_TRANSPORT_LE) {

    GAP_BleReadPeerPrefConnParams(bta_dm_search_cb.peer_bdaddr);

    GAP_BleReadPeerPrefConnParams(bta_dm_search_cb.peer_bdaddr);

  }

  }