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

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

Merge "legacy: Remove unused fields bta/dm/bta_dm_int::tBTA_DM_CB" am:... 

Merge "legacy: Remove unused fields bta/dm/bta_dm_int::tBTA_DM_CB" am: 453aa7ab am: 887948e4 am: 8d4f3ee9 am: e5ade7f6

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1990026

Change-Id: Ic6141614fb1d64cdefadce0b7b9ecb7d6397a358
parents 9ccc37c5 e5ade7f6

system/bta/dm/bta_dm_int.h

+0 −8
Original line number Diff line number Diff line
@@ -314,18 +314,11 @@ typedef struct { 
  tBTA_DM_ACTIVE_LINK device_list;

  tBTA_DM_SEC_CBACK* p_sec_cback;

  tBTA_BLE_ENERGY_INFO_CBACK* p_energy_info_cback;

  uint16_t state;

  bool disabling;

  alarm_t* disable_timer;

  uint32_t wbt_sdp_handle; /* WIDCOMM Extensions SDP record handle */

  uint8_t wbt_scn;         /* WIDCOMM Extensions SCN */

  uint8_t num_central_only;

  uint8_t pm_id;

  tBTA_PM_TIMER pm_timer[BTA_DM_NUM_PM_TIMER];

  uint8_t cur_av_count;   /* current AV connecions */

  bool disable_pair_mode; /* disable pair mode or not */

  bool conn_paired_only;  /* allow connectable to paired device only or not */

  tBTA_DM_API_SEARCH search_msg;



  /* Storage for pin code request parameters */

  RawAddress pin_bd_addr;
@@ -349,7 +342,6 @@ typedef struct { 


  tBTA_DM_ENCRYPT_CBACK* p_encrypt_cback;

  alarm_t* switch_delay_timer;



} tBTA_DM_CB;



/* DM search control block */