Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21b51a29 authored by Hui Peng's avatar Hui Peng
Browse files

[Invisalign2] Move the following APIs to ble_api 

- BTM_BleConfigPrivacy
- BTM_BleLocalPrivacyEnabled

Bug: 301661850
Test: m com.android.btservices
Change-Id: Ife34e144ab68a7c84143078583d3f1a30d8bfba1
parent e3eefabb

system/main/shim/btm_api.h

+0 −25
Original line number Diff line number Diff line
@@ -1120,31 +1120,6 @@ uint16_t BTM_BleReadDiscoverability(); 
 ******************************************************************************/

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

 */

system/stack/btm/btm_ble.cc

+0 −4
Original line number Diff line number Diff line
@@ -65,10 +65,6 @@ bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec, 
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";

}

system/stack/include/btm_ble_api.h

+26 −0
Original line number Diff line number Diff line
@@ -580,4 +580,30 @@ void BTM_BlePeriodicSyncSetInfo(RawAddress addr, uint16_t service_data, 
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

system/stack/include/btm_ble_sec_api.h

+0 −26
Original line number Diff line number Diff line
@@ -202,29 +202,3 @@ bool BTM_BleVerifySignature(const RawAddress& bd_addr, uint8_t* p_orig, 
 *

 ******************************************************************************/

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);

system/test/mock/mock_main_shim_btm_api.cc

+0 −5
Original line number Diff line number Diff line
@@ -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__);