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

Commit 7af5e5fd authored by cheng_cai's avatar cheng_cai Committed by Automerger Merge Worker
Browse files

Fix discover service process using wrong transport am: f5a771b8 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1288519

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5df1d9a974f344474f4a52ac247d48ab4a7a4ffc
parents 0f467fe5 f5a771b8

system/bta/dm/bta_dm_act.cc

+10 −4
Original line number Diff line number Diff line
@@ -1628,9 +1628,6 @@ static void bta_dm_discover_device(const RawAddress& remote_bd_addr) { 
    transport = bta_dm_search_cb.transport;

  }



  /* Reset transport state for next discovery */

  bta_dm_search_cb.transport = BT_TRANSPORT_UNKNOWN;



  VLOG(1) << __func__ << " BDA: " << remote_bd_addr;



  bta_dm_search_cb.peer_bdaddr = remote_bd_addr;
@@ -1659,13 +1656,22 @@ static void bta_dm_discover_device(const RawAddress& remote_bd_addr) { 
      ((bta_dm_search_cb.p_btm_inq_info == NULL) ||

       (bta_dm_search_cb.p_btm_inq_info &&

        (!bta_dm_search_cb.p_btm_inq_info->appl_knows_rem_name)))) {

    if (bta_dm_read_remote_device_name(bta_dm_search_cb.peer_bdaddr, transport))

    if (bta_dm_read_remote_device_name(bta_dm_search_cb.peer_bdaddr,

                                       transport)) {

      if (bta_dm_search_cb.state != BTA_DM_DISCOVER_ACTIVE) {

        /* Reset transport state for next discovery */

        bta_dm_search_cb.transport = BT_TRANSPORT_UNKNOWN;

      }

      return;

    }



    /* starting name discovery failed */

    bta_dm_search_cb.name_discover_done = true;

  }



  /* Reset transport state for next discovery */

  bta_dm_search_cb.transport = BT_TRANSPORT_UNKNOWN;



  /* if application wants to discover service */

  if (bta_dm_search_cb.services) {

    /* initialize variables */