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

Commit b2eed0e6 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Bluetooth 5 Enable->Enabled (2/2)" 

am: c08a5f95

Change-Id: I4d102d76670253d72c719b1ca99457ea05a45e32
parents 6b1b5204 c08a5f95

android/app/jni/com_android_bluetooth_gatt.cpp

+4 −4
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static jmethodID method_onScanResponseDataSet; 
static jmethodID method_onAdvertisingParametersUpdated;

static jmethodID method_onPeriodicAdvertisingParametersUpdated;

static jmethodID method_onPeriodicAdvertisingDataSet;

static jmethodID method_onPeriodicAdvertisingEnable;

static jmethodID method_onPeriodicAdvertisingEnabled;



/**

 * Static variables
@@ -1572,8 +1572,8 @@ static void advertiseClassInitNative(JNIEnv* env, jclass clazz) { 
      clazz, "onPeriodicAdvertisingParametersUpdated", "(II)V");

  method_onPeriodicAdvertisingDataSet =

      env->GetMethodID(clazz, "onPeriodicAdvertisingDataSet", "(II)V");

  method_onPeriodicAdvertisingEnable =

      env->GetMethodID(clazz, "onPeriodicAdvertisingEnable", "(IZI)V");

  method_onPeriodicAdvertisingEnabled =

      env->GetMethodID(clazz, "onPeriodicAdvertisingEnabled", "(IZI)V");

}



static void advertiseInitializeNative(JNIEnv* env, jobject object) {
@@ -1820,7 +1820,7 @@ static void enablePeriodicSetCb(uint8_t advertiser_id, bool enable, 
  CallbackEnv sCallbackEnv(__func__);

  if (!sCallbackEnv.valid()) return;

  sCallbackEnv->CallVoidMethod(mCallbacksObj,

                               method_onPeriodicAdvertisingEnable,

                               method_onPeriodicAdvertisingEnabled,

                               advertiser_id, enable, status);

}

android/app/src/com/android/bluetooth/gatt/AdvertiseManager.java

+4 −3
Original line number Diff line number Diff line
@@ -328,9 +328,10 @@ class AdvertiseManager { 
        callback.onPeriodicAdvertisingDataSet(advertiser_id, status);

    }



    void onPeriodicAdvertisingEnable(int advertiser_id, boolean enable, int status)

    void onPeriodicAdvertisingEnabled(int advertiser_id, boolean enable, int status)

            throws Exception {

        logd("onPeriodicAdvertisingEnable() advertiser_id=" + advertiser_id + ", status=" + status);

        logd("onPeriodicAdvertisingEnabled() advertiser_id=" + advertiser_id + ", status="

                + status);



        Map.Entry<IBinder, AdvertiserInfo> entry = findAdvertiser(advertiser_id);

        if (entry == null) {
@@ -339,7 +340,7 @@ class AdvertiseManager { 
        }



        IAdvertisingSetCallback callback = entry.getValue().callback;

        callback.onPeriodicAdvertisingEnable(advertiser_id, enable, status);

        callback.onPeriodicAdvertisingEnabled(advertiser_id, enable, status);

    }



    private void logd(String s) {