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

Commit c0338393 authored by Sunny Kapdi's avatar Sunny Kapdi Committed by android-build-merger
Browse files

Merge "JNI: Fix callback obj for Advertisement" am: def64aea am: 2d3152cd am: 1c833506 

am: 1eb3c20a

Change-Id: I8a8e9ae3e8e8ecc2c0bd8c6ae7cd0abd7d7096c3
parents 93ae7a49 1eb3c20a

android/app/jni/com_android_bluetooth_gatt.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1927,7 +1927,7 @@ static void setAdvertisingParametersNativeCb(uint8_t advertiser_id, 
                                             uint8_t status, int8_t tx_power) {

  CallbackEnv sCallbackEnv(__func__);

  if (!sCallbackEnv.valid()) return;

  sCallbackEnv->CallVoidMethod(mCallbacksObj,

  sCallbackEnv->CallVoidMethod(mAdvertiseCallbacksObj,

                               method_onAdvertisingParametersUpdated,

                               advertiser_id, tx_power, status);

}
@@ -1940,7 +1940,7 @@ static void setAdvertisingParametersNative(JNIEnv* env, jobject object, 
  AdvertiseParameters params = parseParams(env, parameters);

  sGattIf->advertiser->SetParameters(

      advertiser_id, params,

      base::Bind(setAdvertisingParametersNativeCb, advertiser_id));

      base::Bind(&setAdvertisingParametersNativeCb, advertiser_id));

}



static void setPeriodicAdvertisingParametersNative(
@@ -1971,7 +1971,7 @@ static void enablePeriodicSetCb(uint8_t advertiser_id, bool enable, 
                                uint8_t status) {

  CallbackEnv sCallbackEnv(__func__);

  if (!sCallbackEnv.valid()) return;

  sCallbackEnv->CallVoidMethod(mCallbacksObj,

  sCallbackEnv->CallVoidMethod(mAdvertiseCallbacksObj,

                               method_onPeriodicAdvertisingEnabled,

                               advertiser_id, enable, status);

}