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

Commit a1f2cb18 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix call order for BTM shim RegisterInquiryCallbacks" am: b8d16a3b... 

Merge "Fix call order for BTM shim RegisterInquiryCallbacks" am: b8d16a3b am: 6e7dfeea am: fcbf2216

Change-Id: I50984fa10a3ab28497bf24f470bae93853d7fc60
parents bb23be83 fcbf2216

system/main/shim/btm.cc

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ void bluetooth::shim::Btm::StartUp(bluetooth::shim::Btm* btm) { 
  btm->observing_timer_ = new bluetooth::shim::Timer("observing_timer");

  btm->scanning_timer_ = new bluetooth::shim::Timer("scanning_timer");



  btm->RegisterInquiryCallbacks();

}



void bluetooth::shim::Btm::ShutDown(bluetooth::shim::Btm* btm) {

system/main/shim/btm_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include "types/class_of_device.h"

#include "types/raw_address.h"



static bluetooth::shim::Btm shim_btm;

bluetooth::shim::Btm shim_btm;



/**

 * Legacy bluetooth module global control block state

system/main/shim/entry.cc

+5 −0
Original line number Diff line number Diff line
@@ -16,11 +16,13 @@ 


#include "main/shim/entry.h"

#include "osi/include/future.h"

#include "osi/include/log.h"



#include "hci/controller.h"

#include "hci/hci_layer.h"

#include "hci/le_advertising_manager.h"

#include "hci/le_scanning_manager.h"

#include "main/shim/btm.h"

#include "neighbor/connectability.h"

#include "neighbor/discoverability.h"

#include "neighbor/inquiry.h"
@@ -36,8 +38,11 @@ 


using bluetooth::shim::GetGabeldorscheStack;



extern bluetooth::shim::Btm shim_btm;



future_t* bluetooth::shim::StartGabeldorscheStack() {

  GetGabeldorscheStack()->Start();

  shim_btm.RegisterInquiryCallbacks();

  return (future_t*)nullptr;

}