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

Commit 7bcdb1a6 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

SDP cleanup fix 

When BT stack is turned off, modules should be cleaned up in reverse
order that they are initialized. Therefore, move SDP cleanup before
L2CAP cleanup.

Also, wipe content of control block, including connection control blocks
when SDP is disabled. If any request or timer fires after stack
shutdown, it would not find connection to act on.

Flag: exempt, obvious cleanup
Test: manual, turn bluetooth OFF while SDP is scheduled
Bug: 329431466
Change-Id: I81e6f382466625cc2e0b72b62d91b77f40402b5a
parent d658d2ea

system/btif/src/stack_manager.cc

+1 −1
Original line number Diff line number Diff line
@@ -371,8 +371,8 @@ static void event_shut_down_stack(ProfileStopCallback stopProfiles) { 
  future_await(local_hack_future);



  gatt_free();

  l2c_free();

  sdp_free();

  l2c_free();

  get_btm_client_interface().lifecycle.btm_ble_free();



  get_btm_client_interface().lifecycle.btm_free();

system/stack/sdp/sdp_main.cc

+2 −0
Original line number Diff line number Diff line
@@ -100,10 +100,12 @@ void sdp_init(void) { 
}



void sdp_free(void) {

  L2CA_Deregister(BT_PSM_SDP);

  for (int i = 0; i < SDP_MAX_CONNECTIONS; i++) {

    alarm_free(sdp_cb.ccb[i].sdp_conn_timer);

    sdp_cb.ccb[i].sdp_conn_timer = NULL;

  }

  sdp_cb = {};

}



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