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

Commit 69a3275f authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Jakub Pawłowski
Browse files

Get rid of CancelOpen from bta_dm_disc_result 

Looks like it was added accidentally in aosp/2584253
Please see aosp/2584253/comment/5f10a7c2_8abb90bd/

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

system/bta/dm/bta_dm_disc.cc

+0 −3
Original line number Diff line number Diff line
@@ -615,9 +615,6 @@ static void bta_dm_disc_result(tBTA_DM_SVC_RES& disc_result) { 
    GAP_BleReadPeerPrefConnParams(bta_dm_discovery_cb.peer_bdaddr);

  }



  get_gatt_interface().BTA_GATTC_CancelOpen(0, bta_dm_discovery_cb.peer_bdaddr,

                                            true);



  bta_dm_discovery_set_state(BTA_DM_DISCOVER_IDLE);



  uint16_t conn_id = bta_dm_discovery_cb.conn_id;