[Invisalign2] Make BTA_DmBleConfigLocalPrivacy synchronous am: 21fa0c6 …

…am: c04c69d am: e323c46 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2875614 Change-Id: I729daa8485aff7d45ce7bc602b71961b3faee86e Signed-off-by: Automerger Merge Worker <[email protected]>
realme-mt6781-dev · Dec 14, 2023 · 4b6c37a · 4b6c37a
2 parents 366c2be + e323c46
commit 4b6c37a
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/system/bta/dm/bta_dm_api.cc b/system/bta/dm/bta_dm_api.cc
@@ -26,6 +26,7 @@
 
 #include <vector>
 
+#include "android_bluetooth_flags.h"
 #include "bta/dm/bta_dm_disc.h"
 #include "bta/dm/bta_dm_int.h"
 #include "bta/dm/bta_dm_sec_int.h"
@@ -273,8 +274,12 @@ void BTA_DmBleUpdateConnectionParams(const RawAddress& bd_addr,
  *
  ******************************************************************************/
 void BTA_DmBleConfigLocalPrivacy(bool privacy_enable) {
-  do_in_main_thread(FROM_HERE, base::BindOnce(bta_dm_ble_config_local_privacy,
-                                              privacy_enable));
+  if (IS_FLAG_ENABLED(synchronous_bta_sec)) {
+    bta_dm_ble_config_local_privacy(privacy_enable);
+  } else {
+    do_in_main_thread(FROM_HERE, base::BindOnce(bta_dm_ble_config_local_privacy,
+                                                privacy_enable));
+  }
 }
 
 /*******************************************************************************