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

Commit 01609d02 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "SDP cleanup fix" into main am: 13eb7f94 

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



Change-Id: I9807ab9a452b67a3215f5d061632915c4d187bf5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a4a1850e 13eb7f94

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 = {};

}



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