summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2016-11-03 00:52:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-11-03 00:52:06 +0000
commite108406e30269336ecc4c0304901ac7ddbc14f76 (patch)
tree9f8cabcbdc192e46bb5d0883fefbab69c8f022c4
parent3ee63fdfb7fa5896bff7e172be60c763919c9f63 (diff)
parent6bb2114adfde5e3dcd78860e6ea0a2271e0335b4 (diff)
downloadandroid_packages_apps_Bluetooth-e108406e30269336ecc4c0304901ac7ddbc14f76.tar.gz
android_packages_apps_Bluetooth-e108406e30269336ecc4c0304901ac7ddbc14f76.tar.bz2
android_packages_apps_Bluetooth-e108406e30269336ecc4c0304901ac7ddbc14f76.zip
Merge "DO NOT MERGE BLE Check and send scan response data" into cw-f-dev
-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;
}