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

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

2/10 Unfriend bta::dm::tBTA_DM_PEER_DEVICE 

bta_pm: Add reset_device_info
Bug: 296647114
Test: m .

Change-Id: I033ed09ab3218142e52551e5717d02be8d294f95
parent 2b2ae4e6

system/bta/dm/bta_dm_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -2799,7 +2799,7 @@ void bta_dm_acl_up(const RawAddress& bd_addr, tBT_TRANSPORT transport, 
           bt_transport_text(transport).c_str(), acl_handle);

  device->conn_state = BTA_DM_CONNECTED;

  device->pref_role = BTA_ANY_ROLE;

  device->info = BTA_DM_DI_NONE;

  device->reset_device_info();

  device->transport = transport;



  if (controller_get_interface()->supports_sniff_subrating() &&

system/bta/dm/bta_dm_int.h

+4 −1
Original line number Diff line number Diff line
@@ -259,10 +259,13 @@ struct tBTA_DM_PEER_DEVICE { 
  friend void bta_dm_rm_cback(tBTA_SYS_CONN_STATUS status, uint8_t id,

                              uint8_t app_id, const RawAddress& peer_addr);

  friend void handle_remote_features_complete(const RawAddress& bd_addr);

  tBTA_DM_DEV_INFO info;



  // Dynamic pieces of operational device information

  tBTA_DM_DEV_INFO info{BTA_DM_DI_NONE};



 public:

  tBTA_DM_DEV_INFO Info() const { return info; }

  void reset_device_info() { info = BTA_DM_DI_NONE; }



  tBTA_DM_ENCRYPT_CBACK* p_encrypt_cback;

  tBTM_PM_STATUS prev_low; /* previous low power mode used */