commit 58053205f814441deb70ce3e2228b23bc0df7af7
author Himanshu Rawat <rwt@google.com> Mon Dec 23 14:51:15 2024 -0800
committer Himanshu Rawat <rwt@google.com> Mon Dec 23 14:51:15 2024 -0800
tree 7538e3473738c99172c7230200e044be88f597b6
parent 3993cfb64db12d6fe89bac9394de8244d8e1b148

Remove flag use_local_oob_extended_command

Change-Id: Ic9603e1ab9f7ef2c2fce19eaec2a0d9a93350985
Test: mmm packages/modules/Bluetooth
Flag: com.android.bluetooth.flags.use_local_oob_extended_command
Bug: 342250775

flags/pairing.aconfig

diff --git a/flags/pairing.aconfig b/flags/pairing.aconfig
index 0593c99..376af6e 100644
--- a/flags/pairing.aconfig
+++ b/flags/pairing.aconfig
@@ -32,16 +32,6 @@
 }
 
 flag {
-    name: "use_local_oob_extended_command"
-    namespace: "bluetooth"
-    description: "Use HCI Read Local OOB Extended Data command to generate local OOB when Secure Connections is supported by the controller"
-    bug: "342250775"
-    metadata {
-        purpose: PURPOSE_BUGFIX
-    }
-}
-
-flag {
     name: "pairing_name_discovery_addresss_mismatch"
     namespace: "bluetooth"
     description: "Do not abort pairing if name discovery for a another device fails"

system/stack/btm/btm_sec.cc

diff --git a/system/stack/btm/btm_sec.cc b/system/stack/btm/btm_sec.cc
index 8ddfeb9..dcdc17b 100644
--- a/system/stack/btm/btm_sec.cc
+++ b/system/stack/btm/btm_sec.cc
@@ -1238,8 +1238,7 @@
  *
  ******************************************************************************/
 void BTM_ReadLocalOobData(void) {
-  if (com::android::bluetooth::flags::use_local_oob_extended_command() &&
-      bluetooth::shim::GetController()->SupportsSecureConnections()) {
+  if (bluetooth::shim::GetController()->SupportsSecureConnections()) {
     btsnd_hcic_read_local_oob_extended_data();
   } else {
     btsnd_hcic_read_local_oob_data();