diff options
| author | Wei Wang <weiwa@google.com> | 2014-09-22 20:14:30 -0700 |
|---|---|---|
| committer | Wei Wang <weiwa@google.com> | 2014-10-09 18:02:06 +0000 |
| commit | a1664d61821a59145f8095a75373403a0c54244e (patch) | |
| tree | 1c0b533f93b2c935f9444374f98af5393f15a4f2 /jni | |
| parent | 6482273e836a7a6de5f8d05562ddc1afc2bfa828 (diff) | |
| download | android_packages_apps_Bluetooth-a1664d61821a59145f8095a75373403a0c54244e.tar.gz android_packages_apps_Bluetooth-a1664d61821a59145f8095a75373403a0c54244e.tar.bz2 android_packages_apps_Bluetooth-a1664d61821a59145f8095a75373403a0c54244e.zip | |
Add support of advertising through standard instance.(2/4)
Use standard advertising instance if peripheral mode is support but multi adv is not.
Bug: 17552672
Change-Id: I21044665d0ac38f84abb95bfe1348d7bf83bfd2a
Diffstat (limited to 'jni')
| -rw-r--r-- | jni/com_android_bluetooth_gatt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/jni/com_android_bluetooth_gatt.cpp b/jni/com_android_bluetooth_gatt.cpp index 921ad83b3..b85b9e911 100644 --- a/jni/com_android_bluetooth_gatt.cpp +++ b/jni/com_android_bluetooth_gatt.cpp @@ -1715,6 +1715,8 @@ static JNINativeMethod sAdvertiseMethods[] = { {"gattClientUpdateAdvNative", "(IIIIIII)V", (void *) gattClientUpdateAdvNative}, {"gattClientSetAdvDataNative", "(IZZZI[B[B[B)V", (void *) gattClientSetAdvDataNative}, {"gattClientDisableAdvNative", "(I)V", (void *) gattClientDisableAdvNative}, + {"gattSetAdvDataNative", "(IZZZIII[B[B[B)V", (void *) gattSetAdvDataNative}, + {"gattAdvertiseNative", "(IZ)V", (void *) gattAdvertiseNative}, }; // JNI functions defined in ScanManager class. @@ -1758,7 +1760,6 @@ static JNINativeMethod sMethods[] = { {"gattClientExecuteWriteNative", "(IZ)V", (void *) gattClientExecuteWriteNative}, {"gattClientRegisterForNotificationsNative", "(ILjava/lang/String;IIJJIJJZ)V", (void *) gattClientRegisterForNotificationsNative}, {"gattClientReadRemoteRssiNative", "(ILjava/lang/String;)V", (void *) gattClientReadRemoteRssiNative}, - {"gattAdvertiseNative", "(IZ)V", (void *) gattAdvertiseNative}, {"gattClientConfigureMTUNative", "(II)V", (void *) gattClientConfigureMTUNative}, {"gattConnectionParameterUpdateNative", "(ILjava/lang/String;IIII)V", (void *) gattConnectionParameterUpdateNative}, {"gattServerRegisterAppNative", "(JJ)V", (void *) gattServerRegisterAppNative}, @@ -1776,7 +1777,6 @@ static JNINativeMethod sMethods[] = { {"gattServerSendNotificationNative", "(III[B)V", (void *) gattServerSendNotificationNative}, {"gattServerSendResponseNative", "(IIIIII[BI)V", (void *) gattServerSendResponseNative}, - {"gattSetAdvDataNative", "(IZZZIII[B[B[B)V", (void *) gattSetAdvDataNative}, {"gattTestNative", "(IJJLjava/lang/String;IIIII)V", (void *) gattTestNative}, }; |