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

Commit 710d73be authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "btaa: update to use new hardware include file" am: 25daa2b2 am: 06f88a05 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1508577

Change-Id: I5ffdbf4ab87167c325a3895feb83cf48bec298a4
parents 7e72aa57 06f88a05

jni/com_android_bluetooth_btservice_ActivityAttribution.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include "com_android_bluetooth.h"

#include "com_android_bluetooth.h"

#include "hardware/bt_activity_attribution.h"

#include "hardware/bt_activity_attribution.h"





using bluetooth::activity_attribution::Activity;

using bluetooth::activity_attribution::ActivityAttributionCallbacks;

using bluetooth::activity_attribution::ActivityAttributionCallbacks;

using bluetooth::activity_attribution::ActivityAttributionInterface;

using bluetooth::activity_attribution::ActivityAttributionInterface;
@@ -41,7 +40,7 @@ class ActivityAttributionCallbacksImpl : public ActivityAttributionCallbacks { 
 public:

 public:

  ~ActivityAttributionCallbacksImpl() = default;

  ~ActivityAttributionCallbacksImpl() = default;





  void OnWakeup(Activity activity, const RawAddress& bd_addr) override {

  void OnWakeup(const Activity activity, const RawAddress& bd_addr) override {

    LOG(INFO) << __func__;

    LOG(INFO) << __func__;





    std::shared_lock<std::shared_timed_mutex> lock(callbacks_mutex);

    std::shared_lock<std::shared_timed_mutex> lock(callbacks_mutex);
@@ -107,7 +106,8 @@ static void initNative(JNIEnv* env, jobject object) { 
    return;

    return;

  }

  }





  sActivityAttributionInterface->Init(&sActivityAttributionCallbacks);

  sActivityAttributionInterface->RegisterCallbacks(

      &sActivityAttributionCallbacks);

}

}





static void cleanupNative(JNIEnv* env, jobject object) {

static void cleanupNative(JNIEnv* env, jobject object) {