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

Commit 8cca0ad5 authored by Chris Manton's avatar Chris Manton
Browse files

Add bta::sys::bta_sys_eir_unregister 

Dangling resource was not being cleaned up

Bug: 263402051
Test: gd/cert/run
Tag: #refactor

Change-Id: If05ec8532e680f0d3024b4a44e2a37f6568d68ec
parent 3fe963f6

system/bta/sys/bta_sys.h

+2 −0
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ extern void bta_sys_notify_collision(const RawAddress& peer_addr); 


#if (BTA_EIR_CANNED_UUID_LIST != TRUE)

extern void bta_sys_eir_register(tBTA_SYS_EIR_CBACK* p_cback);

extern void bta_sys_eir_unregister();

extern void bta_sys_add_uuid(uint16_t uuid16);

extern void bta_sys_remove_uuid(uint16_t uuid16);

extern void bta_sys_cust_eir_register(tBTA_SYS_CUST_EIR_CBACK* p_cback);
@@ -261,6 +262,7 @@ extern void bta_sys_add_cust_uuid(const tBTA_CUSTOM_UUID& curr); 
extern void bta_sys_remove_cust_uuid(const tBTA_CUSTOM_UUID& curr);

#else

#define bta_sys_eir_register(ut)

#define bta_sys_eir_unregister()

#define bta_sys_add_uuid(ut)

#define bta_sys_remove_uuid(ut)

#define bta_sys_cust_eir_register(ut)

system/bta/sys/bta_sys_conn.cc

+10 −0
Original line number Diff line number Diff line
@@ -398,9 +398,19 @@ void bta_sys_busy(uint8_t id, uint8_t app_id, const RawAddress& peer_addr) { 
 *

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

void bta_sys_eir_register(tBTA_SYS_EIR_CBACK* p_cback) {

  if (bta_sys_cb.eir_cb != nullptr) {

    LOG_WARN("Already registered extended inquiry result callback");

  }

  bta_sys_cb.eir_cb = p_cback;

}



void bta_sys_eir_unregister() {

  if (bta_sys_cb.eir_cb == nullptr) {

    LOG_WARN("Already unregistered extended inquiry result callback");

  }

  bta_sys_cb.eir_cb = nullptr;

}



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

 *

 * Function         bta_sys_cust_eir_register

system/test/mock/mock_bta_sys_conn.cc

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ void bta_sys_ssr_cfg_register(tBTA_SYS_SSR_CFG_CBACK* p_cback) { 
void bta_sys_eir_register(tBTA_SYS_EIR_CBACK* p_cback) {

  mock_function_count_map[__func__]++;

}

void bta_sys_eir_unregister() { mock_function_count_map[__func__]++; }

void bta_sys_cust_eir_register(tBTA_SYS_CUST_EIR_CBACK* p_cback) {

  mock_function_count_map[__func__]++;

}