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

Commit bf7720a5 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add support for le privacy" am: 8bf96901 am: 0c03db72 am: 782114d7 

Change-Id: I0c492315447875cfd6cc7ac1ca80f0bd18860675
parents 6b4fdc82 782114d7

system/main/shim/btm_api.cc

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <base/callback.h>



#include "device/include/controller.h"

#include "main/shim/btm.h"

#include "main/shim/btm_api.h"

#include "osi/include/log.h"
@@ -714,3 +715,7 @@ void bluetooth::shim::BTM_BleEnableDisableFilterFeature( 
uint8_t bluetooth::shim::BTM_BleMaxMultiAdvInstanceCount() {

  return shim_btm.GetNumberOfAdvertisingInstances();

}



bool bluetooth::shim::BTM_BleLocalPrivacyEnabled(void) {

  return controller_get_interface()->supports_ble_privacy();

}

system/stack/btm/btm_ble_gap.cc

+3 −0
Original line number Diff line number Diff line
@@ -711,6 +711,9 @@ extern uint8_t BTM_BleMaxMultiAdvInstanceCount(void) { 
 ******************************************************************************/

bool BTM_BleLocalPrivacyEnabled(void) {

#if (BLE_PRIVACY_SPT == TRUE)

  if (bluetooth::shim::is_gd_shim_enabled()) {

    return bluetooth::shim::BTM_BleLocalPrivacyEnabled();

  }

  return (btm_cb.ble_ctr_cb.privacy_mode != BTM_PRIVACY_NONE);

#else

  return false;