From 6bb2114adfde5e3dcd78860e6ea0a2271e0335b4 Mon Sep 17 00:00:00 2001
From: Chris Manton <cmanton@google.com>
Date: Mon, 31 Oct 2016 20:48:42 -0700
Subject: DO NOT MERGE BLE Check and send scan response data

If there is scan response data, load it up during
when start advertising.  The current stack does
not provide callback for these calls.

Bug: 32539880

Test: Verified scan response occurs with CL

Change-Id: I33effbf3aa3a60c3353d4ca7708ea06df8a05a7d
---
 src/com/android/bluetooth/gatt/AdvertiseManager.java | 3 +++
 1 file changed, 3 insertions(+)

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;
         }
 
-- 
cgit v1.2.3