From e6d1ee1703c4ff0b50339a2c67ef015bb1bc4d89 Mon Sep 17 00:00:00 2001
From: Martin Brabham <optedoblivion@google.com>
Date: Fri, 22 Apr 2022 16:07:39 +0000
Subject: [PATCH] Floss: Set the default event mask for Classic and LE BTA API
Bug: 224601538
Test: mma -j $(nproc)
Test: ./build.py
Tag: #floss
Change-Id: Ib3f6fb95e146480bdcab3b2093837e9867738231
---
system/bta/dm/bta_dm_act.cc | 14 ++++++++++++++
system/bta/dm/bta_dm_api.cc | 5 +++++
system/bta/dm/bta_dm_int.h | 1 +
system/bta/include/bta_api.h | 11 +++++++++++
4 files changed, 31 insertions(+)
diff --git a/system/bta/dm/bta_dm_act.cc b/system/bta/dm/bta_dm_act.cc
index d2e0bd76a2f..f9fa7e1230b 100644
--- a/system/bta/dm/bta_dm_act.cc
+++ b/system/bta/dm/bta_dm_act.cc
@@ -4069,6 +4069,20 @@ void bta_dm_le_rand(LeRandCallback cb) {
bluetooth::shim::BTM_LeRand(cb);
}
+/*******************************************************************************
+ *
+ * Function BTA_DmSetDefaultEventMask
+ *
+ * Description Floss: Set the default event mask for Classic and LE
+ *
+ * Parameters
+ *
+ *******************************************************************************/
+void bta_dm_set_default_event_mask() {
+ // Autoplumbed
+ bluetooth::shim::BTM_SetDefaultEventMask();
+}
+
/*******************************************************************************
*
* Function BTA_DmSetEventFilterInquiryResultAllDevices
diff --git a/system/bta/dm/bta_dm_api.cc b/system/bta/dm/bta_dm_api.cc
index f222b53a193..480151b9f48 100644
--- a/system/bta/dm/bta_dm_api.cc
+++ b/system/bta/dm/bta_dm_api.cc
@@ -699,6 +699,11 @@ void BTA_DmLeRand(LeRandCallback cb) {
do_in_main_thread(FROM_HERE, base::Bind(bta_dm_le_rand, cb));
}
+void BTA_DmSetDefaultEventMask() {
+ APPL_TRACE_API("BTA_DmSetDefaultEventMask");
+ do_in_main_thread(FROM_HERE, base::Bind(bta_dm_set_default_event_mask));
+}
+
void BTA_DmSetEventFilterInquiryResultAllDevices() {
APPL_TRACE_API("BTA_DmSetEventFilterInquiryResultAllDevices");
do_in_main_thread(
diff --git a/system/bta/dm/bta_dm_int.h b/system/bta/dm/bta_dm_int.h
index 9d0e90aaba7..a80856e58c6 100644
--- a/system/bta/dm/bta_dm_int.h
+++ b/system/bta/dm/bta_dm_int.h
@@ -549,6 +549,7 @@ extern void bta_dm_clear_event_mask(void);
extern void bta_dm_clear_filter_accept_list(void);
extern void bta_dm_disconnect_all_acls(void);
extern void bta_dm_le_rand(LeRandCallback cb);
+extern void bta_dm_set_default_event_mask();
extern void bta_dm_set_event_filter_inquiry_result_all_devices();
uint8_t bta_dm_search_get_state();
diff --git a/system/bta/include/bta_api.h b/system/bta/include/bta_api.h
index 175936788c4..c0d8a681a4a 100644
--- a/system/bta/include/bta_api.h
+++ b/system/bta/include/bta_api.h
@@ -1218,6 +1218,17 @@ using LeRandCallback = base::Callback<void(uint64_t)>;
******************************************************************************/
extern void BTA_DmLeRand(LeRandCallback cb);
+/*******************************************************************************
+ *
+ * Function BTA_DmSetDefaultEventMask
+ *
+ * Description Floss: Set the default event mask for Classic and LE
+ *
+ * Parameters
+ *
+ *******************************************************************************/
+extern void BTA_DmSetDefaultEventMask();
+
/*******************************************************************************
*
* Function BTA_DmSetEventFilterInquiryResultAllDevices
--
GitLab