From: Chris Manton <cmanton@google.com>
Date: Fri, 27 Nov 2020 07:12:49 +0000 (-0800)
Subject: Add stack/btm/btm_main::btm_free
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f822a6b195;p=android-x86%2Fsystem-bt.git

Add stack/btm/btm_main::btm_free

Towards life cycle aware code

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

Change-Id: I71d8c1dc32b6ca3b94b5ae0c90b4134975a4e0b0
---

diff --git a/stack/btm/btm_main.cc b/stack/btm/btm_main.cc
index b637d75a9..482c43acd 100644
--- a/stack/btm/btm_main.cc
+++ b/stack/btm/btm_main.cc
@@ -34,7 +34,9 @@ tBTM_CB btm_cb;
 
 extern void btm_acl_init(void);
 extern void btm_dev_init(void);
+extern void btm_dev_free(void);
 extern void btm_inq_db_init(void);
+extern void btm_inq_db_free(void);
 extern void btm_sco_init(void);
 extern void wipe_secrets_and_remove(tBTM_SEC_DEV_REC* p_dev_rec);
 
@@ -89,6 +91,8 @@ void btm_free(void) {
   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) {
@@ -99,6 +103,7 @@ 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;