Loading android/app/jni/com_android_bluetooth_gatt.cpp +4 −3 Original line number Original line Diff line number Diff line Loading @@ -999,12 +999,13 @@ static void gattClientScanNative(JNIEnv* env, jobject object, jboolean start) { static void gattClientConnectNative(JNIEnv* env, jobject object, jint clientif, static void gattClientConnectNative(JNIEnv* env, jobject object, jint clientif, jstring address, jboolean isDirect, jstring address, jboolean isDirect, jint transport) { jint transport, jint initiating_phys) { if (!sGattIf) return; if (!sGattIf) return; bt_bdaddr_t bda; bt_bdaddr_t bda; jstr2bdaddr(env, &bda, address); jstr2bdaddr(env, &bda, address); sGattIf->client->connect(clientif, &bda, isDirect, transport); sGattIf->client->connect(clientif, &bda, isDirect, transport, initiating_phys); } } static void gattClientDisconnectNative(JNIEnv* env, jobject object, static void gattClientDisconnectNative(JNIEnv* env, jobject object, Loading Loading @@ -2035,7 +2036,7 @@ static JNINativeMethod sMethods[] = { (void*)gattClientRegisterAppNative}, (void*)gattClientRegisterAppNative}, {"gattClientUnregisterAppNative", "(I)V", {"gattClientUnregisterAppNative", "(I)V", (void*)gattClientUnregisterAppNative}, (void*)gattClientUnregisterAppNative}, {"gattClientConnectNative", "(ILjava/lang/String;ZI)V", {"gattClientConnectNative", "(ILjava/lang/String;ZII)V", (void*)gattClientConnectNative}, (void*)gattClientConnectNative}, {"gattClientDisconnectNative", "(ILjava/lang/String;I)V", {"gattClientDisconnectNative", "(ILjava/lang/String;I)V", (void*)gattClientDisconnectNative}, (void*)gattClientDisconnectNative}, Loading android/app/src/com/android/bluetooth/gatt/GattService.java +6 −5 Original line number Original line Diff line number Diff line Loading @@ -1571,9 +1571,10 @@ public class GattService extends ProfileService { void clientConnect(int clientIf, String address, boolean isDirect, int transport, int phy) { void clientConnect(int clientIf, String address, boolean isDirect, int transport, int phy) { enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission"); enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission"); if (DBG) Log.d(TAG, "clientConnect() - address=" + address + ", isDirect=" + isDirect); if (DBG) // TODO(jpawlowski): propagate PHY! Log.d(TAG, "clientConnect() - address=" + address + ", isDirect=" + isDirect + ", phy= " gattClientConnectNative(clientIf, address, isDirect, transport); + phy); gattClientConnectNative(clientIf, address, isDirect, transport, phy); } } void clientDisconnect(int clientIf, String address) { void clientDisconnect(int clientIf, String address) { Loading Loading @@ -2428,8 +2429,8 @@ public class GattService extends ProfileService { private native void gattClientUnregisterAppNative(int clientIf); private native void gattClientUnregisterAppNative(int clientIf); private native void gattClientConnectNative(int clientIf, String address, private native void gattClientConnectNative( boolean isDirect, int transport); int clientIf, String address, boolean isDirect, int transport, int initiating_phys); private native void gattClientDisconnectNative(int clientIf, String address, private native void gattClientDisconnectNative(int clientIf, String address, int conn_id); int conn_id); Loading Loading
android/app/jni/com_android_bluetooth_gatt.cpp +4 −3 Original line number Original line Diff line number Diff line Loading @@ -999,12 +999,13 @@ static void gattClientScanNative(JNIEnv* env, jobject object, jboolean start) { static void gattClientConnectNative(JNIEnv* env, jobject object, jint clientif, static void gattClientConnectNative(JNIEnv* env, jobject object, jint clientif, jstring address, jboolean isDirect, jstring address, jboolean isDirect, jint transport) { jint transport, jint initiating_phys) { if (!sGattIf) return; if (!sGattIf) return; bt_bdaddr_t bda; bt_bdaddr_t bda; jstr2bdaddr(env, &bda, address); jstr2bdaddr(env, &bda, address); sGattIf->client->connect(clientif, &bda, isDirect, transport); sGattIf->client->connect(clientif, &bda, isDirect, transport, initiating_phys); } } static void gattClientDisconnectNative(JNIEnv* env, jobject object, static void gattClientDisconnectNative(JNIEnv* env, jobject object, Loading Loading @@ -2035,7 +2036,7 @@ static JNINativeMethod sMethods[] = { (void*)gattClientRegisterAppNative}, (void*)gattClientRegisterAppNative}, {"gattClientUnregisterAppNative", "(I)V", {"gattClientUnregisterAppNative", "(I)V", (void*)gattClientUnregisterAppNative}, (void*)gattClientUnregisterAppNative}, {"gattClientConnectNative", "(ILjava/lang/String;ZI)V", {"gattClientConnectNative", "(ILjava/lang/String;ZII)V", (void*)gattClientConnectNative}, (void*)gattClientConnectNative}, {"gattClientDisconnectNative", "(ILjava/lang/String;I)V", {"gattClientDisconnectNative", "(ILjava/lang/String;I)V", (void*)gattClientDisconnectNative}, (void*)gattClientDisconnectNative}, Loading
android/app/src/com/android/bluetooth/gatt/GattService.java +6 −5 Original line number Original line Diff line number Diff line Loading @@ -1571,9 +1571,10 @@ public class GattService extends ProfileService { void clientConnect(int clientIf, String address, boolean isDirect, int transport, int phy) { void clientConnect(int clientIf, String address, boolean isDirect, int transport, int phy) { enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission"); enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission"); if (DBG) Log.d(TAG, "clientConnect() - address=" + address + ", isDirect=" + isDirect); if (DBG) // TODO(jpawlowski): propagate PHY! Log.d(TAG, "clientConnect() - address=" + address + ", isDirect=" + isDirect + ", phy= " gattClientConnectNative(clientIf, address, isDirect, transport); + phy); gattClientConnectNative(clientIf, address, isDirect, transport, phy); } } void clientDisconnect(int clientIf, String address) { void clientDisconnect(int clientIf, String address) { Loading Loading @@ -2428,8 +2429,8 @@ public class GattService extends ProfileService { private native void gattClientUnregisterAppNative(int clientIf); private native void gattClientUnregisterAppNative(int clientIf); private native void gattClientConnectNative(int clientIf, String address, private native void gattClientConnectNative( boolean isDirect, int transport); int clientIf, String address, boolean isDirect, int transport, int initiating_phys); private native void gattClientDisconnectNative(int clientIf, String address, private native void gattClientDisconnectNative(int clientIf, String address, int conn_id); int conn_id); Loading