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

Commit df8ea088 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: 5759cf1a 

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

Change-Id: I2072d340d6ea4b2525f848deb7ad2cb9f6a99af1
parents 8dba955f 5759cf1a

android/app/jni/com_android_bluetooth_btservice_ActivityAttribution.cpp

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

#include "hardware/bt_activity_attribution.h"



using bluetooth::activity_attribution::Activity;

using bluetooth::activity_attribution::ActivityAttributionCallbacks;

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

  ~ActivityAttributionCallbacksImpl() = default;



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

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

    LOG(INFO) << __func__;



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

  }



  sActivityAttributionInterface->Init(&sActivityAttributionCallbacks);

  sActivityAttributionInterface->RegisterCallbacks(

      &sActivityAttributionCallbacks);

}



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