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

Commit f1c6465b authored by Zach Johnson's avatar Zach Johnson
Browse files

Pull BTA_EnableBluetooth out of btif_init_ok 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I38a8eff4ed5cefec62bfbce4cc4ca039f8507183
parent 86a3740d

system/btif/src/btif_core.cc

+0 −1
Original line number Original line Diff line number Diff line
@@ -268,7 +268,6 @@ int btif_is_enabled(void) { 




void btif_init_ok() {

void btif_init_ok() {

  btif_dm_load_ble_local_keys();

  btif_dm_load_ble_local_keys();

  BTA_EnableBluetooth(bte_dm_evt);

}

}





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

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

system/btif/src/stack_manager.cc

+1 −0
Original line number Original line Diff line number Diff line
@@ -221,6 +221,7 @@ static void event_start_up_stack(UNUSED_ATTR void* context) { 
  main_thread_start_up();

  main_thread_start_up();





  btif_init_ok();

  btif_init_ok();

  BTA_EnableBluetooth(bte_dm_evt);





  if (future_await(local_hack_future) != FUTURE_SUCCESS) {

  if (future_await(local_hack_future) != FUTURE_SUCCESS) {

    LOG_ERROR("%s failed to start up the stack", __func__);

    LOG_ERROR("%s failed to start up the stack", __func__);