summaryrefslogtreecommitdiffstats
path: root/jni
diff options
context:
space:
mode:
authorAndre Eisenbach <eisenbach@google.com>2014-08-07 15:19:45 -0700
committerAndre Eisenbach <eisenbach@google.com>2014-08-07 15:19:45 -0700
commitc1512abbe9bb60c94c5f46e90918983d1514c8e3 (patch)
tree372627b40180cc54ec30098bda7255204430dca8 /jni
parentd8a747e0e92700d336d326ed778c59a1783eded0 (diff)
downloadandroid_packages_apps_Bluetooth-c1512abbe9bb60c94c5f46e90918983d1514c8e3.tar.gz
android_packages_apps_Bluetooth-c1512abbe9bb60c94c5f46e90918983d1514c8e3.tar.bz2
android_packages_apps_Bluetooth-c1512abbe9bb60c94c5f46e90918983d1514c8e3.zip
LE: Add limited advertising duration capability (3/3)
Change-Id: Ib025d8a10cce07e8f731c005d963245aa988be73
Diffstat (limited to 'jni')
-rw-r--r--jni/com_android_bluetooth_gatt.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/jni/com_android_bluetooth_gatt.cpp b/jni/com_android_bluetooth_gatt.cpp
index 57fad29dc..f12d48e1b 100644
--- a/jni/com_android_bluetooth_gatt.cpp
+++ b/jni/com_android_bluetooth_gatt.cpp
@@ -1442,21 +1442,23 @@ static void gattConnectionParameterUpdateNative(JNIEnv *env, jobject object, jin
}
static void gattClientEnableAdvNative(JNIEnv* env, jobject object, jint client_if,
- jint min_interval, jint max_interval, jint adv_type, jint chnl_map, jint tx_power)
+ jint min_interval, jint max_interval, jint adv_type, jint chnl_map, jint tx_power,
+ jint timeout_s)
{
if (!sGattIf) return;
sGattIf->client->multi_adv_enable(client_if, min_interval, max_interval, adv_type, chnl_map,
- tx_power);
+ tx_power, timeout_s);
}
static void gattClientUpdateAdvNative(JNIEnv* env, jobject object, jint client_if,
- jint min_interval, jint max_interval, jint adv_type, jint chnl_map, jint tx_power)
+ jint min_interval, jint max_interval, jint adv_type, jint chnl_map, jint tx_power,
+ jint timeout_s)
{
if (!sGattIf) return;
sGattIf->client->multi_adv_update(client_if, min_interval, max_interval, adv_type, chnl_map,
- tx_power);
+ tx_power, timeout_s);
}
static void gattClientSetAdvDataNative(JNIEnv* env, jobject object , jint client_if,
@@ -1711,8 +1713,8 @@ static void gattTestNative(JNIEnv *env, jobject object, jint command,
// JNI functions defined in AdvertiseManager class.
static JNINativeMethod sAdvertiseMethods[] = {
- {"gattClientEnableAdvNative", "(IIIIII)V", (void *) gattClientEnableAdvNative},
- {"gattClientUpdateAdvNative", "(IIIIII)V", (void *) gattClientUpdateAdvNative},
+ {"gattClientEnableAdvNative", "(IIIIIII)V", (void *) gattClientEnableAdvNative},
+ {"gattClientUpdateAdvNative", "(IIIIIII)V", (void *) gattClientUpdateAdvNative},
{"gattClientSetAdvDataNative", "(IZZZI[B[B[B)V", (void *) gattClientSetAdvDataNative},
{"gattClientDisableAdvNative", "(I)V", (void *) gattClientDisableAdvNative},
};