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

Commit dcf9a24d authored by Mingguang Xu's avatar Mingguang Xu Committed by Automerger Merge Worker
Browse files

Merge "btaa: Add the method of onActivityLogsReady into JNI interface" am: b8d6bff0 

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

Change-Id: Ib7abe68ec48b914ba72765505ab31444ee4ea23f
parents 04fdbba7 b8d6bff0

jni/com_android_bluetooth_btservice_ActivityAttribution.cpp

+26 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ using bluetooth::activity_attribution::ActivityAttributionInterface; 


namespace android {

static jmethodID method_onWakeup;

static jmethodID method_onActivityLogsReady;



static ActivityAttributionInterface* sActivityAttributionInterface = nullptr;

static std::shared_timed_mutex interface_mutex;
@@ -60,12 +61,37 @@ class ActivityAttributionCallbacksImpl : public ActivityAttributionCallbacks { 
    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onWakeup, (jint)activity,

                                 addr.get());

  }



  void OnActivityLogsReady(

      const std::vector<BtaaAggregationEntry> logs) override {

    LOG(INFO) << __func__;



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

    CallbackEnv sCallbackEnv(__func__);

    if (!sCallbackEnv.valid() || mCallbacksObj == nullptr) return;



    jsize logs_size = logs.size() * sizeof(BtaaAggregationEntry);

    ScopedLocalRef<jbyteArray> addr(sCallbackEnv.get(),

                                    sCallbackEnv->NewByteArray(logs_size));

    if (!addr.get()) {

      LOG(ERROR) << "Failed to allocate jbyteArray for logs from activity "

                    "logging callback";

      return;

    }



    sCallbackEnv->SetByteArrayRegion(addr.get(), 0, logs_size,

                                     (jbyte*)logs.data());

    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onActivityLogsReady,

                                 addr.get());

  }

};



static ActivityAttributionCallbacksImpl sActivityAttributionCallbacks;



static void classInitNative(JNIEnv* env, jclass clazz) {

  method_onWakeup = env->GetMethodID(clazz, "onWakeup", "(I[B)V");

  method_onActivityLogsReady =

      env->GetMethodID(clazz, "onActivityLogsReady", "([B)V");



  LOG(INFO) << __func__ << ": succeeds";

}

src/com/android/bluetooth/btservice/activityAttribution/ActivityAttributionNativeInterface.java

+4 −0
Original line number Diff line number Diff line
@@ -67,6 +67,10 @@ public class ActivityAttributionNativeInterface { 
        Log.i(TAG, "onWakeup() BTAA: " + activity);

    }



    private void onActivityLogsReady(byte[] logs) {

        Log.i(TAG, "onActivityLogsReady() BTAA: " + logs);

    }



    // Native methods that call into the JNI interface

    private static native void classInitNative();