btaa: add btaa into the shim

Add btaa module into the shim. Implemented various helper functions.

Tag: #feature
Bug: 172501038
Test: m
Change-Id: I23b86a7b75ad301aae62d47ca34a5524a60844a1

diff --git a/main/shim/entry.cc b/main/shim/entry.cc
index ed2380f..3cf49d1 100644 (file)
--- a/main/shim/entry.cc
+++ b/main/shim/entry.cc
@@ -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

diff --git a/main/shim/entry.h b/main/shim/entry.h
index 0a32c72..1ba72d1 100644 (file)
--- a/main/shim/entry.h
+++ b/main/shim/entry.h
@@ -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

diff --git a/main/shim/shim.cc b/main/shim/shim.cc
index ebbbc61..090de6f 100644 (file)
--- a/main/shim/shim.cc
+++ b/main/shim/shim.cc
@@ -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();
+}

diff --git a/main/shim/shim.h b/main/shim/shim.h
index fb29a4e..2510017 100644 (file)
--- a/main/shim/shim.h
+++ b/main/shim/shim.h
@@ -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();
 
 /**

diff --git a/main/shim/stack.cc b/main/shim/stack.cc
index 6410c90..d14ef26 100644 (file)
--- a/main/shim/stack.cc
+++ b/main/shim/stack.cc
@@ -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>();