Merge "Add btm_free() to clean up btm properly" into pi-dev (130f5b5c) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/btm/btm_int.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ extern tBTM_CB btm_cb;
		*******************************************
		*/
		extern void btm_init(void);
		extern void btm_free(void);

		/* Internal functions provided by btm_inq.cc
		******************************************

+18 −0

Original line number	Diff line number	Diff line
		@@ -74,3 +74,21 @@ void btm_init(void) {

		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) {
		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;

		list_free(btm_cb.sec_dev_rec);
		btm_cb.sec_dev_rec = NULL;

		alarm_free(btm_cb.sec_collision_timer);
		btm_cb.sec_collision_timer = NULL;

		alarm_free(btm_cb.pairing_timer);
		btm_cb.pairing_timer = NULL;
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -87,11 +87,13 @@ void btu_init_core(void) {
		*****************************************************************************/
		void btu_free_core(void) {
		/* Free the mandatory core stack components */
		gatt_free();

		l2c_free();

		sdp_free();

		gatt_free();
		btm_free();
		}

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