[Invisalign2] Move the following APIs to ble_api
- BTM_BleConfigPrivacy
- BTM_BleLocalPrivacyEnabled
Bug: 301661850
Test: m com.android.btservices
Change-Id: Ife34e144ab68a7c84143078583d3f1a30d8bfba1
diff --git a/system/main/shim/btm_api.h b/system/main/shim/btm_api.h
index bf47ebb..81803ce 100644
--- a/system/main/shim/btm_api.h
+++ b/system/main/shim/btm_api.h
@@ -1120,31 +1120,6 @@
******************************************************************************/
uint16_t BTM_BleReadConnectability();
-/*******************************************************************************
- *
- * Function BTM_BleConfigPrivacy
- *
- * Description This function is called to enable or disable the privacy in
- * the local device.
- *
- * Parameters enable: true to enable it; false to disable it.
- *
- * Returns bool privacy mode set success; otherwise failed.
- *
- ******************************************************************************/
-bool BTM_BleConfigPrivacy(bool enable);
-
-/*******************************************************************************
- *
- * Function BTM_BleLocalPrivacyEnabled
- *
- * Description Checks if local device supports private address
- *
- * Returns Return true if local privacy is enabled else false
- *
- ******************************************************************************/
-bool BTM_BleLocalPrivacyEnabled(void);
-
/**
* This functions are called to configure the adv data payload filter condition
*/
diff --git a/system/stack/btm/btm_ble.cc b/system/stack/btm/btm_ble.cc
index 9d80fd3..fc9b677 100644
--- a/system/stack/btm/btm_ble.cc
+++ b/system/stack/btm/btm_ble.cc
@@ -65,10 +65,6 @@
void gatt_notify_phy_updated(tHCI_STATUS status, uint16_t handle,
uint8_t tx_phy, uint8_t rx_phy);
-#ifndef PROPERTY_BLE_PRIVACY_ENABLED
-#define PROPERTY_BLE_PRIVACY_ENABLED "bluetooth.core.gap.le.privacy.enabled"
-#endif
-
namespace {
constexpr char kBtmLogTag[] = "SEC";
}
diff --git a/system/stack/include/btm_ble_api.h b/system/stack/include/btm_ble_api.h
index a78ceae..4e218e5 100644
--- a/system/stack/include/btm_ble_api.h
+++ b/system/stack/include/btm_ble_api.h
@@ -580,4 +580,30 @@
void BTM_BlePeriodicSyncTxParameters(RawAddress addr, uint8_t mode,
uint16_t skip, uint16_t timeout,
StartSyncCb syncCb);
+
+/*******************************************************************************
+ *
+ * Function BTM_BleConfigPrivacy
+ *
+ * Description This function is called to enable or disable the privacy in
+ * the local device.
+ *
+ * Parameters enable: true to enable it; false to disable it.
+ *
+ * Returns bool privacy mode set success; otherwise failed.
+ *
+ ******************************************************************************/
+bool BTM_BleConfigPrivacy(bool enable);
+
+/*******************************************************************************
+ *
+ * Function BTM_BleLocalPrivacyEnabled
+ *
+ * Description Checks if local device supports private address
+ *
+ * Returns Return true if local privacy is enabled else false
+ *
+ ******************************************************************************/
+bool BTM_BleLocalPrivacyEnabled(void);
+
#endif
diff --git a/system/stack/include/btm_ble_sec_api.h b/system/stack/include/btm_ble_sec_api.h
index df068a5..9aaf9a3 100644
--- a/system/stack/include/btm_ble_sec_api.h
+++ b/system/stack/include/btm_ble_sec_api.h
@@ -202,29 +202,3 @@
*
******************************************************************************/
void BTM_BleLoadLocalKeys(uint8_t key_type, tBTM_BLE_LOCAL_KEYS* p_key);
-
-/*******************************************************************************
- *
- * Function BTM_BleConfigPrivacy
- *
- * Description This function is called to enable or disable the privacy in
- * the local device.
- *
- * Parameters enable: true to enable it; false to disable it.
- *
- * Returns bool privacy mode set success; otherwise failed.
- *
- ******************************************************************************/
-bool BTM_BleConfigPrivacy(bool enable);
-
-/*******************************************************************************
- *
- * Function BTM_BleLocalPrivacyEnabled
- *
- * Description Checks if local device supports private address
- *
- * Returns Return true if local privacy is enabled else false
- *
- ******************************************************************************/
-bool BTM_BleLocalPrivacyEnabled(void);
-
diff --git a/system/test/mock/mock_main_shim_btm_api.cc b/system/test/mock/mock_main_shim_btm_api.cc
index 5b4f16e..8d69f35 100644
--- a/system/test/mock/mock_main_shim_btm_api.cc
+++ b/system/test/mock/mock_main_shim_btm_api.cc
@@ -33,11 +33,6 @@
Octet16 octet16;
-bool bluetooth::shim::BTM_BleLocalPrivacyEnabled(void) {
- inc_func_call_count(__func__);
- return false;
-}
-
bool bluetooth::shim::BTM_HasEirService(const uint32_t* p_eir_uuid,
uint16_t uuid16) {
inc_func_call_count(__func__);
