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

Commit 5d11836a authored by Chris Manton's avatar Chris Manton
Browse files

Re-order btm_cb init/free sequence 

Test: gd/cert/run --host
Bug: 163134718
Tag: #refactor

Change-Id: I719fad7c0d5c5d3b4f2c90b0540659f351786346
parent 66298066

system/stack/btm/btm_main.cc

+9 −8
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ void btm_init(void) { 
  /* All fields are cleared; nonzero fields are reinitialized in appropriate

   * function */

  memset(&btm_cb, 0, sizeof(tBTM_CB));

  btm_cb.btm_inq_vars.remote_name_timer = nullptr;



  btm_cb.page_queue = fixed_queue_new(SIZE_MAX);

  btm_cb.sec_pending_q = fixed_queue_new(SIZE_MAX);

  btm_cb.sec_collision_timer = alarm_new("btm.sec_collision_timer");
@@ -66,33 +68,33 @@ void btm_init(void) { 
#else

  btm_cb.trace_level = BT_TRACE_LEVEL_NONE; /* No traces */

#endif

  /* Initialize BTM component structures */

  btm_inq_db_init(); /* Inquiry Database and Structures */

  btm_acl_init();    /* ACL Database and Structures */

  /* Security Manager Database and Structures */

  if (stack_config_get_interface()->get_pts_secure_only_mode())

    btm_cb.security_mode = BTM_SEC_MODE_SC;

  else

    btm_cb.security_mode = BTM_SEC_MODE_SP;

  btm_cb.pairing_bda = RawAddress::kAny;

  btm_cb.sec_dev_rec = list_new(osi_free);



  /* Initialize BTM component structures */

  btm_inq_db_init(); /* Inquiry Database and Structures */

  btm_acl_init();    /* ACL Database and Structures */

  btm_sco_init(); /* SCO Database and Structures (If included) */



  btm_cb.sec_dev_rec = list_new(osi_free);



  btm_dev_init(); /* Device Manager Structures & HCI_Reset */

}



/** This function is called to free dynamic memory and system resource allocated by btm_init */

void btm_free(void) {

  btm_dev_free();

  btm_inq_db_free();



  fixed_queue_free(btm_cb.page_queue, NULL);

  btm_cb.page_queue = NULL;



  fixed_queue_free(btm_cb.sec_pending_q, NULL);

  btm_cb.sec_pending_q = NULL;



  btm_dev_free();



  list_node_t* end = list_end(btm_cb.sec_dev_rec);

  list_node_t* node = list_begin(btm_cb.sec_dev_rec);

  while (node != end) {
@@ -103,7 +105,6 @@ void btm_free(void) { 
    wipe_secrets_and_remove(p_dev_rec);

  }



  btm_inq_db_free();

  list_free(btm_cb.sec_dev_rec);

  btm_cb.sec_dev_rec = NULL;