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

Commit f49d56c3 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Mask "LE Enhanced Connection Complete" when BLE_PRIVACY_SPT=FALSE" 

am: 508295c4

Change-Id: I59cc169f1bfd172a1c2acb358f3b60ad389db562
parents 0c34ccf0 508295c4

system/device/src/controller.cc

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

#include "stack/include/btm_ble_api.h"



const bt_event_mask_t BLE_EVENT_MASK = {

    {0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x1E, 0x7f}};

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

#if (BLE_PRIVACY_SPT == TRUE)

                                         0x1E,

#else

                                         /* Disable "LE Enhanced Connection

                                            Complete" when privacy is off */

                                         0x1C,

#endif

                                         0x7f}};



const bt_event_mask_t CLASSIC_EVENT_MASK = {HCI_DUMO_EVENT_MASK_EXT};

system/stack/include/hcidefs.h

+1 −6
Original line number Diff line number Diff line
@@ -788,12 +788,7 @@ constexpr uint8_t HCI_LE_STATES_INIT_MASTER_SLAVE_BIT = 41; 
    0x0000000000200000 Connectionless Broadcast Channel Map Change Event

    0x0000000000400000 Inquiry Response Notification Event

*/

#if (BLE_PRIVACY_SPT == TRUE)

/* BLE event mask */

#define HCI_BLE_EVENT_MASK_DEF "\x00\x00\x00\x00\x00\x00\x07\xff"

#else

#define HCI_BLE_EVENT_MASK_DEF "\x00\x00\x00\x00\x00\x00\x00\x7f"

#endif



/*

 * Definitions for packet type masks (BT1.2 and BT2.0 definitions)

*/