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

Commit 6f9bf8d5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "btaa: add btaa into the shim"

parents f4e304e1 aa76d43e

system/main/shim/entry.cc

+7 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 * limitations under the License.

 */



#include "gd/btaa/activity_attribution.h"

#include "gd/hci/controller.h"

#include "gd/hci/hci_layer.h"

#include "gd/hci/le_advertising_manager.h"
@@ -124,5 +125,11 @@ hci::AclManager* GetAclManager() { 
      ->GetInstance<hci::AclManager>();

}



activity_attribution::ActivityAttribution* GetActivityAttribution() {

  return Stack::GetInstance()

      ->GetStackManager()

      ->GetInstance<activity_attribution::ActivityAttribution>();

}



}  // namespace shim

}  // namespace bluetooth

system/main/shim/entry.h

+4 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ namespace bluetooth { 
namespace os {

class Handler;

}

namespace activity_attribution {

class ActivityAttribution;

}

namespace neighbor {

class ConnectabilityModule;

class DiscoverabilityModule;
@@ -87,6 +90,7 @@ hci::LeScanningManager* GetScanning(); 
bluetooth::security::SecurityModule* GetSecurityModule();

storage::StorageModule* GetStorage();

hci::AclManager* GetAclManager();

activity_attribution::ActivityAttribution* GetActivityAttribution();



}  // namespace shim

}  // namespace bluetooth

system/main/shim/shim.cc

+4 −0
Original line number Diff line number Diff line
@@ -97,3 +97,7 @@ bool bluetooth::shim::is_any_gd_enabled() { 
bool bluetooth::shim::is_gd_stack_started_up() {

  return bluetooth::shim::Stack::GetInstance()->IsRunning();

}



bool bluetooth::shim::is_gd_btaa_enabled() {

  return bluetooth::common::init_flags::btaa_hci_is_enabled();

}

system/main/shim/shim.h

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ bool is_gd_hci_enabled(); 
bool is_gd_controller_enabled();

bool is_gd_l2cap_enabled();

bool is_gd_shim_enabled();

bool is_gd_btaa_enabled();

bool is_any_gd_enabled();



/**

system/main/shim/stack.cc

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "device/include/controller.h"



#include "gd/att/att_module.h"

#include "gd/btaa/activity_attribution.h"

#include "gd/common/init_flags.h"

#include "gd/hal/hci_hal.h"

#include "gd/hci/acl_manager.h"
@@ -117,6 +118,9 @@ void Stack::StartEverything() { 
  if (common::init_flags::gd_scanning_is_enabled()) {

    modules.add<hci::LeScanningManager>();

  }

  if (common::init_flags::btaa_hci_is_enabled()) {

    modules.add<activity_attribution::ActivityAttribution>();

  }

  if (common::init_flags::gd_core_is_enabled()) {

    modules.add<att::AttModule>();

    modules.add<neighbor::ConnectabilityModule>();