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

Commit 7cfa9fcc authored by Michael Sun's avatar Michael Sun Committed by Rahul Sabnis
Browse files

btaa: add btaa shim implementation 

Implement the btaa shim layer to connect gd with btif.

Tag: #feature
Bug: 172501038
Test: m
Change-Id: I8f6ec9d0b74425184ca19128167ed4ae554b4197
parent 6f9bf8d5

system/include/hardware/bt_activity_attribution.h

+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ class ActivityAttributionInterface { 
 public:

  virtual ~ActivityAttributionInterface() = default;



  /** Init the interface. */

  virtual void Init(void) = 0;



  /** Register JNI callbacks with the interface. */

  virtual void RegisterCallbacks(ActivityAttributionCallbacks* callbacks) = 0;

system/main/shim/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ filegroup { 
        "acl.cc",

        "acl_api.cc",

        "acl_legacy_interface.cc",

        "activity_attribution.cc",

        "btm.cc",

        "btm_api.cc",

        "config.cc",

system/main/shim/activity_attribution.cc

0 → 100644
+67 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#define LOG_TAG "bt_shim_activity_attribution"

#include "activity_attribution.h"



#include "btif_common.h"

#include "gd/btaa/activity_attribution.h"

#include "helpers.h"

#include "main/shim/entry.h"



class ActivityAttributionInterfaceImpl

    : public ActivityAttributionInterface,

      public bluetooth::activity_attribution::ActivityAttributionCallback {

 public:

  ~ActivityAttributionInterfaceImpl() override = default;



  static ActivityAttributionInterfaceImpl* GetInstance() {

    static ActivityAttributionInterfaceImpl* instance =

        new ActivityAttributionInterfaceImpl();

    return instance;

  }



  void Init() override {

    bluetooth::shim::GetActivityAttribution()

        ->RegisterActivityAttributionCallback(this);

  }



  void RegisterCallbacks(ActivityAttributionCallbacks* callbacks) override {

    this->callbacks = callbacks;

  }



  void Cleanup(void) override{};



  void OnWakeup(const Activity activity,

                const bluetooth::hci::Address& address) override {

    do_in_jni_thread(

        FROM_HERE, base::Bind(&ActivityAttributionCallbacks::OnWakeup,

                              base::Unretained(callbacks),

                              (ActivityAttributionCallbacks::Activity)activity,

                              bluetooth::ToRawAddress(address)));

  }



 private:

  // Private constructor to prevent construction.

  ActivityAttributionInterfaceImpl() {}



  ActivityAttributionCallbacks* callbacks;

};



ActivityAttributionInterface*

bluetooth::shim::get_activity_attribution_instance() {

  return ActivityAttributionInterfaceImpl::GetInstance();

}

system/main/shim/activity_attribution.h

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



/**

 * Gd shim layer to activity attribution

 */

#pragma once



#include "include/hardware/bt_activity_attribution.h"



using namespace bluetooth::activity_attribution;



namespace bluetooth {

namespace shim {



ActivityAttributionInterface* get_activity_attribution_instance();



}  // namespace shim

}  // namespace bluetooth

system/main/shim/stack.cc

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include "gd/storage/storage_module.h"



#include "main/shim/acl_legacy_interface.h"

#include "main/shim/activity_attribution.h"

#include "main/shim/hci_layer.h"

#include "main/shim/helpers.h"

#include "main/shim/l2c_api.h"
@@ -162,6 +163,9 @@ void Stack::StartEverything() { 
      !common::init_flags::gd_core_is_enabled()) {

    L2CA_UseLegacySecurityModule();

  }

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

    bluetooth::shim::get_activity_attribution_instance()->Init();

  }

}



void Stack::Start(ModuleList* modules) {