am 07fb5f59: am 777e88d2: am f021c4ee: Merge "Add transport parameter to createBond() function (3/4)" into lmp-dev

* commit '07fb5f5902e8915b266d80475d05b6709fba06df':
  Add transport parameter to createBond() function (3/4)

1 files changed, 3 insertions, 3 deletions

diff --git a/jni/com_android_bluetooth_btservice_AdapterService.cpp b/jni/com_android_bluetooth_btservice_AdapterService.cpp
index 6e574c3b2..d8dbcc530 100755
--- a/jni/com_android_bluetooth_btservice_AdapterService.cpp
+++ b/jni/com_android_bluetooth_btservice_AdapterService.cpp
@@ -832,7 +832,7 @@ static jboolean cancelDiscoveryNative(JNIEnv* env, jobject obj) {
     return result;
 }
 
-static jboolean createBondNative(JNIEnv* env, jobject obj, jbyteArray address) {
+static jboolean createBondNative(JNIEnv* env, jobject obj, jbyteArray address, jint transport) {
     ALOGV("%s:",__FUNCTION__);
 
     jbyte *addr;
@@ -846,7 +846,7 @@ static jboolean createBondNative(JNIEnv* env, jobject obj, jbyteArray address) {
         return result;
     }
 
-    int ret = sBluetoothInterface->create_bond((bt_bdaddr_t *)addr);
+    int ret = sBluetoothInterface->create_bond((bt_bdaddr_t *)addr, transport);
     env->ReleaseByteArrayElements(address, addr, 0);
     result = (ret == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;
 
@@ -1221,7 +1221,7 @@ static JNINativeMethod sMethods[] = {
     {"setDevicePropertyNative", "([BI[B)Z", (void*) setDevicePropertyNative},
     {"startDiscoveryNative", "()Z", (void*) startDiscoveryNative},
     {"cancelDiscoveryNative", "()Z", (void*) cancelDiscoveryNative},
-    {"createBondNative", "([B)Z", (void*) createBondNative},
+    {"createBondNative", "([BI)Z", (void*) createBondNative},
     {"removeBondNative", "([B)Z", (void*) removeBondNative},
     {"cancelBondNative", "([B)Z", (void*) cancelBondNative},
     {"isConnectedNative", "([B)Z", (void*) isConnectedNative},