Remove cancel_open_discovery_client flag

Bug: 356168480
Flag: com.android.bluetooth.flags.cancel_open_discovery_client
Test: m -j;
Change-Id: I47374fb223674fab0bcc04505342d5ab3bb74bdf

2 files changed, 2 insertions, 17 deletions

diff --git a/flags/bta_dm.aconfig b/flags/bta_dm.aconfig
index 19e8418785..be510f63cd 100644
--- a/flags/bta_dm.aconfig
+++ b/flags/bta_dm.aconfig
@@ -9,16 +9,6 @@ flag {
 }
 
 flag {
-    name: "cancel_open_discovery_client"
-    namespace: "bluetooth"
-    description: "Cancel connection from discovery client correctly"
-    bug: "356168480"
-    metadata {
-        purpose: PURPOSE_BUGFIX
-    }
-}
-
-flag {
     name: "extend_and_randomize_role_switch_delay"
     namespace: "bluetooth"
     description: "Fix the possible conflicts between role switch and authentication"
diff --git a/system/bta/dm/bta_dm_disc.cc b/system/bta/dm/bta_dm_disc.cc
index b3f010e86e..79d3421361 100644
--- a/system/bta/dm/bta_dm_disc.cc
+++ b/system/bta/dm/bta_dm_disc.cc
@@ -152,8 +152,7 @@ gatt_interface_t& get_gatt_interface() { return *gatt_interface; }
 
 void bta_dm_disc_gatt_cancel_open(const RawAddress& bd_addr) {
   get_gatt_interface().BTA_GATTC_CancelOpen(0, bd_addr, false);
-  if (com::android::bluetooth::flags::cancel_open_discovery_client() &&
-      bta_dm_discovery_cb.client_if != BTA_GATTS_INVALID_IF) {
+  if (bta_dm_discovery_cb.client_if != BTA_GATTS_INVALID_IF) {
     get_gatt_interface().BTA_GATTC_CancelOpen(bta_dm_discovery_cb.client_if, bd_addr, true);
   }
 }
@@ -559,11 +558,7 @@ static void bta_dm_gatt_disc_complete(tCONN_ID conn_id, tGATT_STATUS status) {
   } else {
     log::info("Discovery complete for invalid conn ID. Will pick up next job");
 
-    if (com::android::bluetooth::flags::cancel_open_discovery_client()) {
-      bta_dm_close_gatt_conn(bta_dm_discovery_cb.conn_id);
-    } else {
-      bta_dm_discovery_cb.conn_id = GATT_INVALID_CONN_ID;
-    }
+    bta_dm_close_gatt_conn(bta_dm_discovery_cb.conn_id);
     if (bta_dm_discovery_cb.transports & BT_TRANSPORT_BR_EDR) {
       log::info("classic discovery still pending {}", bta_dm_discovery_cb.peer_bdaddr);
       return;