summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Manton <cmanton@google.com>2016-11-03 00:56:00 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-11-03 00:56:00 +0000
commitf48e98fe5426fff27cc43c1f62117d506295f003 (patch)
tree9f8cabcbdc192e46bb5d0883fefbab69c8f022c4
parenta76d5985c4b6cbeab9c5b12cb66e9ec6175bd40b (diff)
parent6bb2114adfde5e3dcd78860e6ea0a2271e0335b4 (diff)
downloadandroid_packages_apps_Bluetooth-f48e98fe5426fff27cc43c1f62117d506295f003.tar.gz
android_packages_apps_Bluetooth-f48e98fe5426fff27cc43c1f62117d506295f003.tar.bz2
android_packages_apps_Bluetooth-f48e98fe5426fff27cc43c1f62117d506295f003.zip
DO NOT MERGE BLE Check and send scan response data
am: 6bb2114adf Change-Id: I97ebca38b9a8d5e05decaa1b8a79d6ed789fb078
-rw-r--r--src/com/android/bluetooth/gatt/AdvertiseManager.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/bluetooth/gatt/AdvertiseManager.java b/src/com/android/bluetooth/gatt/AdvertiseManager.java
index a53eb4153..40313a646 100644
--- a/src/com/android/bluetooth/gatt/AdvertiseManager.java
+++ b/src/com/android/bluetooth/gatt/AdvertiseManager.java
@@ -306,6 +306,9 @@ class AdvertiseManager {
return false;
}
setAdvertisingData(client, client.advertiseData, false);
+ if (client.scanResponse != null) {
+ setAdvertisingData(client, client.scanResponse, true);
+ }
return true;
}