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

Commit 685cfe87 authored by Sunny Kapdi's avatar Sunny Kapdi
Browse files

JNI: Fix callback obj for Advertisement 

Use the Advertise callback object for all Advertisement
calls in jni

Bug: 62305016
Change-Id: I6511decdff48be58c6e45cb6b93932589ca6464e
parent f4fa0af6

android/app/jni/com_android_bluetooth_gatt.cpp

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

                                             uint8_t status, int8_t tx_power) {

  CallbackEnv sCallbackEnv(__func__);

  CallbackEnv sCallbackEnv(__func__);

  if (!sCallbackEnv.valid()) return;

  if (!sCallbackEnv.valid()) return;

  sCallbackEnv->CallVoidMethod(mCallbacksObj,

  sCallbackEnv->CallVoidMethod(mAdvertiseCallbacksObj,

                               method_onAdvertisingParametersUpdated,

                               method_onAdvertisingParametersUpdated,

                               advertiser_id, tx_power, status);

                               advertiser_id, tx_power, status);

}

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

  AdvertiseParameters params = parseParams(env, parameters);

  sGattIf->advertiser->SetParameters(

  sGattIf->advertiser->SetParameters(

      advertiser_id, params,

      advertiser_id, params,

      base::Bind(setAdvertisingParametersNativeCb, advertiser_id));

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

}

}





static void setPeriodicAdvertisingParametersNative(

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

                                uint8_t status) {

  CallbackEnv sCallbackEnv(__func__);

  CallbackEnv sCallbackEnv(__func__);

  if (!sCallbackEnv.valid()) return;

  if (!sCallbackEnv.valid()) return;

  sCallbackEnv->CallVoidMethod(mCallbacksObj,

  sCallbackEnv->CallVoidMethod(mAdvertiseCallbacksObj,

                               method_onPeriodicAdvertisingEnabled,

                               method_onPeriodicAdvertisingEnabled,

                               advertiser_id, enable, status);

                               advertiser_id, enable, status);

}

}