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

Commit f39130c0 authored by Chris Manton's avatar Chris Manton
Browse files

legacy: Remove BLE_PRIVACY_SPT checks 

Bug: 80551254
Test: gd/cert/run
Tag: #refactor

Change-Id: I9a07603076fceee54992929c04cef2a5b6595caf
parent 6c493ac9

system/bta/dm/bta_dm_act.cc

+0 −2
Original line number Diff line number Diff line
@@ -3736,12 +3736,10 @@ void bta_dm_ble_update_conn_params(const RawAddress& bd_addr, uint16_t min_int, 
  }

}



#if (BLE_PRIVACY_SPT == TRUE)

/** This function set the local device LE privacy settings. */

void bta_dm_ble_config_local_privacy(bool privacy_enable) {

  BTM_BleConfigPrivacy(privacy_enable);

}

#endif



static void bta_dm_start_scan(uint8_t duration_sec) {

  tBTM_STATUS status = BTM_BleObserve(

system/bta/dm/bta_dm_api.cc

+0 −4
Original line number Diff line number Diff line
@@ -520,12 +520,8 @@ void BTA_DmBleUpdateConnectionParams(const RawAddress& bd_addr, 
 *

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

void BTA_DmBleConfigLocalPrivacy(bool privacy_enable) {

#if (BLE_PRIVACY_SPT == TRUE)

  do_in_main_thread(

      FROM_HERE, base::Bind(bta_dm_ble_config_local_privacy, privacy_enable));

#else

  UNUSED(privacy_enable);

#endif

}



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

system/device/src/controller.cc

+2 −9
Original line number Diff line number Diff line
@@ -34,15 +34,8 @@ 
#include "osi/include/properties.h"

#include "stack/include/btm_ble_api.h"



const bt_event_mask_t BLE_EVENT_MASK = {{0x00, 0x00, 0x00, 0x00, 0x7F, 0x02,

#if (BLE_PRIVACY_SPT == TRUE)

                                         0xFE,

#else

                                         /* Disable "LE Enhanced Connection

                                            Complete" when privacy is off */

                                         0xFC,

#endif

                                         0x7f}};

const bt_event_mask_t BLE_EVENT_MASK = {

    {0x00, 0x00, 0x00, 0x00, 0x7F, 0x02, 0xFE, 0x7f}};



const bt_event_mask_t CLASSIC_EVENT_MASK = {HCI_DUMO_EVENT_MASK_EXT};