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

Commit ab676f26 authored by Pavlin Radoslavov's avatar Pavlin Radoslavov
Browse files

Add missing initialization of module OSI_MODULE 

Also, fix a resource leak (memory + file descriptors)
inside function AVDT_WriteReqOpt().
The leak was exposed by the module OSI_MODULE initialization fix
when audio is playing.

Bug: 21743601
Change-Id: Ia220042b9060b0640ac0851f4f9132ddf2773264
parent 01fc55b9

system/btcore/src/osi_module.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ future_t *osi_clean_up(void) { 
  return future_new_immediate(FUTURE_SUCCESS);

}



const module_t osi_module = {

EXPORT_SYMBOL const module_t osi_module = {

  .name = OSI_MODULE,

  .init = osi_init,

  .start_up = NULL,

system/btif/src/stack_manager.c

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ static void event_init_stack(void *context) { 
  if (!stack_is_initialized) {

    module_management_start();



    module_init(get_module(OSI_MODULE));

    module_init(get_module(BT_UTILS_MODULE));

    module_init(get_module(BTIF_CONFIG_MODULE));

    btif_init_bluetooth();

system/stack/avdt/avdt_api.c

+3 −0
Original line number Diff line number Diff line
@@ -967,6 +967,9 @@ UINT16 AVDT_WriteReqOpt(UINT8 handle, BT_HDR *p_pkt, UINT32 time_stamp, UINT8 m_ 
        evt.apiwrite.frag_q = fixed_queue_new(SIZE_MAX);

#endif

        avdt_scb_event(p_scb, AVDT_SCB_API_WRITE_REQ_EVT, &evt);

#if AVDT_MULTIPLEXING == TRUE

        fixed_queue_free(evt.apiwrite.frag_q, NULL);

#endif

    }



    return result;