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

Commit ebe64490 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove useless BTM features definition" am: 90c7928e am: 99a0504b 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1393536

Change-Id: I9eebb1d64daec0bcc1f9712257931bc5849adafe
parents 46c2cfcd 99a0504b

system/bta/dm/bta_dm_int.h

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ typedef struct { 
  bool dc_known;

  BD_NAME bd_name;

  uint8_t

      features[BTM_FEATURE_BYTES_PER_PAGE * (BTM_EXT_FEATURES_PAGE_MAX + 1)];

      features[HCI_FEATURE_BYTES_PER_PAGE * (HCI_EXT_FEATURES_PAGE_MAX + 1)];

  uint8_t pin_length;

} tBTA_DM_API_ADD_DEVICE;

system/stack/include/btm_api_types.h

+0 −4
Original line number Diff line number Diff line
@@ -679,10 +679,6 @@ typedef uint16_t tBTM_BL_EVENT_MASK; 
#define BTM_BL_UPDATE_MASK 0x0004

#define BTM_BL_ROLE_CHG_MASK 0x0008



/* Device features mask definitions */

#define BTM_FEATURE_BYTES_PER_PAGE HCI_FEATURE_BYTES_PER_PAGE

#define BTM_EXT_FEATURES_PAGE_MAX HCI_EXT_FEATURES_PAGE_MAX



/* the data type associated with BTM_BL_CONN_EVT */

typedef struct {

  tBTM_BL_EVENT event;     /* The event reported. */