Merge "Remove close_rfcomm_instead_of_reset flag" into main

2 files changed, 1 insertions, 11 deletions

diff --git a/flags/hfp.aconfig b/flags/hfp.aconfig
index 76acd21f7d..dabe666bfa 100644
--- a/flags/hfp.aconfig
+++ b/flags/hfp.aconfig
@@ -30,13 +30,6 @@ flag {
 }
 
 flag {
-    name: "close_rfcomm_instead_of_reset"
-    namespace: "bluetooth"
-    description: "Closing Rfcomm Connection instead of reset"
-    bug: "316993992"
-}
-
-flag {
     name: "pretend_network_service"
     namespace: "bluetooth"
     description: "during ongoing call, pretend network service in +CIND when network is unavailable"
diff --git a/system/bta/ag/bta_ag_act.cc b/system/bta/ag/bta_ag_act.cc
index 8ae13c17fc..d6f2675c07 100644
--- a/system/bta/ag/bta_ag_act.cc
+++ b/system/bta/ag/bta_ag_act.cc
@@ -584,10 +584,7 @@ void bta_ag_rfc_acp_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
       log::info(
           "close outgoing connection before accepting {} with conn_handle={}",
           ag_scb.peer_addr, ag_scb.conn_handle);
-      if (!com::android::bluetooth::flags::close_rfcomm_instead_of_reset()) {
-        // Fail the outgoing connection to clean up any upper layer states
-        bta_ag_rfc_fail(&ag_scb, tBTA_AG_DATA::kEmpty);
-      }
+
       // If client port is opened, close it, state machine will handle rfcomm
       // closed in opening state as failure and pass to upper layer
       if (ag_scb.conn_handle > 0) {