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

Commit 24b6e6bc authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

Stop address rotation when stack is shutdown am: b03a1aa5 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22a7027057637d9486bad061427891df9a428807
parents cc3831a8 b03a1aa5

system/btif/src/stack_manager.cc

+1 −0
Original line number Diff line number Diff line
@@ -298,6 +298,7 @@ static void event_shut_down_stack(UNUSED_ATTR void* context) { 
  gatt_free();

  l2c_free();

  sdp_free();

  btm_ble_free();

  btm_free();



  if (bluetooth::shim::is_any_gd_enabled()) {

system/stack/btm/btm_ble_gap.cc

+6 −0
Original line number Diff line number Diff line
@@ -2399,6 +2399,12 @@ void btm_ble_init(void) { 
#endif

}



// Clean up btm ble control block

void btm_ble_free() {

  tBTM_BLE_CB* p_cb = &btm_cb.ble_ctr_cb;

  alarm_free(p_cb->addr_mgnt_cb.refresh_raddr_timer);

}



/*******************************************************************************

 *

 * Function         btm_ble_topology_check

system/stack/btm/btm_ble_int.h

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ extern void btm_ble_stop_scan(void); 
extern void btm_clear_all_pending_le_entry(void);



extern void btm_ble_init(void);

extern void btm_ble_free();

extern void btm_ble_connected(const RawAddress& bda, uint16_t handle,

                              uint8_t enc_mode, uint8_t role,

                              tBLE_ADDR_TYPE addr_type, bool addr_matched);