Merge changes Ib291c9a6,I98ca045b into main

* changes:
  Removing flag fix_pairing_failure_reason_from_remote
  Removing flag force_bredr_for_sdp_retry

4 files changed, 2 insertions, 25 deletions

diff --git a/flags/btif_dm.aconfig b/flags/btif_dm.aconfig
index 2da8590def..9000dfe30b 100644
--- a/flags/btif_dm.aconfig
+++ b/flags/btif_dm.aconfig
@@ -2,13 +2,6 @@ package: "com.android.bluetooth.flags"
 container: "com.android.btservices"
 
 flag {
-    name: "force_bredr_for_sdp_retry"
-    namespace: "bluetooth"
-    description: "Force BR/EDR transport for retrying SDP service discovery"
-    bug: "326656580"
-}
-
-flag {
     name: "do_not_replace_existing_cod_with_uncategorized_cod"
     namespace: "bluetooth"
     description: "Don't replace an existing stored class of device with one determined to be uncategorized"
diff --git a/flags/security.aconfig b/flags/security.aconfig
index f6ff588ae6..0f1261df2c 100644
--- a/flags/security.aconfig
+++ b/flags/security.aconfig
@@ -30,13 +30,6 @@ flag {
 }
 
 flag {
-    name: "fix_pairing_failure_reason_from_remote"
-    namespace: "bluetooth"
-    description: "Correct the pairing failure reason reported from remote"
-    bug: "320745565"
-}
-
-flag {
     name: "fix_le_oob_pairing_bypass"
     namespace: "bluetooth"
     description: "Fix oob bypassing bug in SMP"
diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc
index 87a0439f9f..e3fd42d3fd 100644
--- a/system/btif/src/btif_dm.cc
+++ b/system/btif/src/btif_dm.cc
@@ -1697,11 +1697,7 @@ static void btif_on_service_discovery_results(
     if (pairing_cb.sdp_attempts) {
       log::warn("SDP failed after bonding re-attempting for {}", bd_addr);
       pairing_cb.sdp_attempts++;
-      if (com::android::bluetooth::flags::force_bredr_for_sdp_retry()) {
-        btif_dm_get_remote_services(bd_addr, BT_TRANSPORT_BR_EDR);
-      } else {
-        btif_dm_get_remote_services(bd_addr, BT_TRANSPORT_AUTO);
-      }
+      btif_dm_get_remote_services(bd_addr, BT_TRANSPORT_BR_EDR);
     } else {
       log::warn("SDP triggered by someone failed when bonding");
     }
diff --git a/system/stack/smp/smp_act.cc b/system/stack/smp/smp_act.cc
index f9c1580039..97fc68c165 100644
--- a/system/stack/smp/smp_act.cc
+++ b/system/stack/smp/smp_act.cc
@@ -535,12 +535,7 @@ void smp_proc_pair_fail(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
               p_cb->rcvd_cmd_len);
     p_cb->status = SMP_INVALID_PARAMETERS;
   } else {
-    if (com::android::bluetooth::flags::
-            fix_pairing_failure_reason_from_remote()) {
-      p_cb->status = static_cast<tSMP_STATUS>(p_data->p_data[0]);
-    } else {
-      p_cb->status = p_data->status;
-    }
+    p_cb->status = static_cast<tSMP_STATUS>(p_data->p_data[0]);
   }
 
   /* Cancel pending auth complete timer if set */