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

Commit 5f173b80 authored by Hsin-chen Chuang's avatar Hsin-chen Chuang Committed by Gerrit Code Review
Browse files

Merge changes I36230e8c,I2903dffa 

* changes:
  DIS_ReadDISInfo: Connect GATT when failed to get conn_id
  floss: Avoid reading DIS info when no GATT connection
parents 8d71ba7f 9830b39e

system/bta/dm/bta_dm_act.cc

+2 −1
Original line number Diff line number Diff line
@@ -1568,7 +1568,8 @@ void bta_dm_search_cmpl() { 
  bta_dm_search_cb.gatt_disc_active = false;



#if TARGET_FLOSS

  if (DIS_ReadDISInfo(bta_dm_search_cb.peer_bdaddr, bta_dm_read_dis_cmpl,

  if (conn_id != GATT_INVALID_CONN_ID &&

      DIS_ReadDISInfo(bta_dm_search_cb.peer_bdaddr, bta_dm_read_dis_cmpl,

                      DIS_ATTR_PNP_ID_BIT)) {

    return;

  }

system/stack/srvc/srvc_dis.cc

+5 −3
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ tDIS_STATUS DIS_SrUpdate(tDIS_ATTR_BIT dis_attr_bit, tDIS_ATTR* p_info) { 
 *

 * Description      Read remote device DIS information.

 *

 * Returns          void

 * Returns          true on success, false otherwise

 *

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

bool DIS_ReadDISInfo(const RawAddress& peer_bda, tDIS_READ_CBACK* p_cback,
@@ -453,8 +453,10 @@ bool DIS_ReadDISInfo(const RawAddress& peer_bda, tDIS_READ_CBACK* p_cback, 
          << StringPrintf(" cl_read_uuid: 0x%04x",

                          dis_attr_uuid[dis_cb.dis_read_uuid_idx]);



  GATT_GetConnIdIfConnected(srvc_eng_cb.gatt_if, peer_bda, &conn_id,

                            BT_TRANSPORT_LE);

  if (!GATT_GetConnIdIfConnected(srvc_eng_cb.gatt_if, peer_bda, &conn_id,

                                 BT_TRANSPORT_LE)) {

    conn_id = GATT_INVALID_CONN_ID;

  }



  /* need to enhance it as multiple service is needed */

  srvc_eng_request_channel(peer_bda, SRVC_ID_DIS);