diff options
Diffstat (limited to 'jni')
| -rw-r--r-- | jni/com_android_bluetooth_btservice_AdapterService.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/jni/com_android_bluetooth_btservice_AdapterService.cpp b/jni/com_android_bluetooth_btservice_AdapterService.cpp index 2ba302d2f..bb1435c25 100644 --- a/jni/com_android_bluetooth_btservice_AdapterService.cpp +++ b/jni/com_android_bluetooth_btservice_AdapterService.cpp @@ -278,7 +278,8 @@ static void device_found_callback(int num_properties, } static void bond_state_changed_callback(bt_status_t status, RawAddress* bd_addr, - bt_bond_state_t state) { + bt_bond_state_t state, + int fail_reason) { CallbackEnv sCallbackEnv(__func__); if (!sCallbackEnv.valid()) return; @@ -297,11 +298,14 @@ static void bond_state_changed_callback(bt_status_t status, RawAddress* bd_addr, (jbyte*)bd_addr); sCallbackEnv->CallVoidMethod(sJniCallbacksObj, method_bondStateChangeCallback, - (jint)status, addr.get(), (jint)state); + (jint)status, addr.get(), (jint)state, + (jint)fail_reason); } static void acl_state_changed_callback(bt_status_t status, RawAddress* bd_addr, - bt_acl_state_t state, bt_hci_error_code_t hci_reason) { + bt_acl_state_t state, + int transport_link_type, + bt_hci_error_code_t hci_reason) { if (!bd_addr) { ALOGE("Address is null in %s", __func__); return; @@ -320,7 +324,8 @@ static void acl_state_changed_callback(bt_status_t status, RawAddress* bd_addr, (jbyte*)bd_addr); sCallbackEnv->CallVoidMethod(sJniCallbacksObj, method_aclStateChangeCallback, - (jint)status, addr.get(), (jint)state, (jint)hci_reason); + (jint)status, addr.get(), (jint)state, + (jint)transport_link_type, (jint)hci_reason); } static void discovery_state_changed_callback(bt_discovery_state_t state) { @@ -840,10 +845,10 @@ static void classInitNative(JNIEnv* env, jclass clazz) { env->GetMethodID(jniCallbackClass, "sspRequestCallback", "([B[BIII)V"); method_bondStateChangeCallback = - env->GetMethodID(jniCallbackClass, "bondStateChangeCallback", "(I[BI)V"); + env->GetMethodID(jniCallbackClass, "bondStateChangeCallback", "(I[BII)V"); method_aclStateChangeCallback = - env->GetMethodID(jniCallbackClass, "aclStateChangeCallback", "(I[BII)V"); + env->GetMethodID(jniCallbackClass, "aclStateChangeCallback", "(I[BIII)V"); method_linkQualityReportCallback = env->GetMethodID( jniCallbackClass, "linkQualityReportCallback", "(JIIIIII)V"); |