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

Commit 53dd65a5 authored by Ajay Panicker's avatar Ajay Panicker Committed by Gerrit Code Review
Browse files

Merge "Fix warnings in packages/apps/Bluetooth"

parents 3e1e2f6e c38bcfa4

jni/com_android_bluetooth_a2dp.cpp

+4 −2
Original line number Diff line number Diff line
@@ -96,7 +96,9 @@ static void bta2dp_audio_state_callback(btav_audio_state_t state, bt_bdaddr_t* b 
static btav_callbacks_t sBluetoothA2dpCallbacks = {

    sizeof(sBluetoothA2dpCallbacks),

    bta2dp_connection_state_callback,

    bta2dp_audio_state_callback

    bta2dp_audio_state_callback,

    NULL, /* audio_config_cb */

    NULL  /* audio_focus_request_cb */

};



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

jni/com_android_bluetooth_btservice_AdapterService.cpp

+7 −3
Original line number Diff line number Diff line
@@ -351,7 +351,8 @@ static void discovery_state_changed_callback(bt_discovery_state_t state) { 


static void pin_request_callback(bt_bdaddr_t *bd_addr, bt_bdname_t *bdname, uint32_t cod,

        bool min_16_digits) {

    jbyteArray addr, devname;

    jbyteArray addr = NULL;

    jbyteArray devname = NULL;

    if (!checkCallbackThread()) {

       ALOGE("Callback: '%s' is not called on the correct thread", __FUNCTION__);

       return;
@@ -386,7 +387,8 @@ Fail: 


static void ssp_request_callback(bt_bdaddr_t *bd_addr, bt_bdname_t *bdname, uint32_t cod,

                                 bt_ssp_variant_t pairing_variant, uint32_t pass_key) {

    jbyteArray addr, devname;

    jbyteArray addr = NULL;

    jbyteArray devname = NULL;

    if (!checkCallbackThread()) {

       ALOGE("Callback: '%s' is not called on the correct thread", __FUNCTION__);

       return;
@@ -771,7 +773,9 @@ static jboolean createBondNative(JNIEnv* env, jobject obj, jbyteArray address, j 
    return result;

}



static jbyteArray callByteArrayGetter(JNIEnv* env, jobject object, char* className, char* methodName) {

static jbyteArray callByteArrayGetter(JNIEnv* env, jobject object,

                                      const char* className,

                                      const char* methodName) {

    jclass myClass = env->FindClass(className);

    jmethodID myMethod = env->GetMethodID(myClass, methodName, "()[B");

    return (jbyteArray) env->CallObjectMethod(object, myMethod);

jni/com_android_bluetooth_gatt.cpp

+4 −1
Original line number Diff line number Diff line
@@ -632,7 +632,10 @@ static const btgatt_client_callbacks_t sGattClientCallbacks = { 
    btgattc_batchscan_reports_cb,

    btgattc_batchscan_threshold_cb,

    btgattc_track_adv_event_cb,

    btgattc_scan_parameter_setup_completed_cb

    btgattc_scan_parameter_setup_completed_cb,

    NULL, /* get_gatt_db_cb */

    NULL, /* services_removed_cb */

    NULL  /* services_added_cb */

};