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

Commit 5b44509e authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Separate discovery complete method from bta_dm_search_cmpl 

Separate logic related to GATT service discovery finish from device
search complete handler.

Service discovery callback need to be called just in one case - when
GATT discovery is finished. In remaining cases, search complete is
enough.

Bug: 335732980
Bug: 330675788
Flag: com.android.bluetooth.flags.separate_service_and_device_discovery
Test: mma -j32
Change-Id: Icf238a7c70d1dc685adf87a6a90f7a872054a9c2
parent 97594069

system/bta/dm/bta_dm_disc.cc

+15 −14
Original line number Diff line number Diff line
@@ -842,16 +842,10 @@ static void bta_dm_read_dis_cmpl(const RawAddress& addr, 
}

#endif



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

 *

 * Function         bta_dm_search_cmpl

 *

 * Description      Sends event to application

 *

 * Returns          void

 *

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

static void bta_dm_search_cmpl() {

static void bta_dm_service_discovery_cmpl() {

  // TODO: we shouldn't change search state, just service discovery state, but

  // both state machines are now joined. This bug will be fixed in upcoming

  // patches.

  bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);



  uint16_t conn_id = bta_dm_search_cb.conn_id;
@@ -910,9 +904,6 @@ static void bta_dm_search_cmpl() { 
    }

  }



  if (bta_dm_search_cb.p_device_search_cback) {

    bta_dm_search_cb.p_device_search_cback(BTA_DM_DISC_CMPL_EVT, nullptr);

  }

  bta_dm_search_cb.gatt_disc_active = false;



#if TARGET_FLOSS
@@ -926,6 +917,16 @@ static void bta_dm_search_cmpl() { 
  bta_dm_execute_queued_request();

}



static void bta_dm_search_cmpl() {

  bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);



  if (bta_dm_search_cb.p_device_search_cback) {

    bta_dm_search_cb.p_device_search_cback(BTA_DM_DISC_CMPL_EVT, nullptr);

  }



  bta_dm_execute_queued_request();

}



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

 *

 * Function         bta_dm_disc_result
@@ -957,7 +958,7 @@ static void bta_dm_disc_result(tBTA_DM_SVC_RES& disc_result) { 
    get_gatt_interface().BTA_GATTC_CancelOpen(0, bta_dm_search_cb.peer_bdaddr,

                                              true);



    bta_dm_search_cmpl();

    bta_dm_service_discovery_cmpl();

  }

}