Fix null settings in AdvertiseCallback.onStartSuccess

Test: acts FilteringTest
Bug: 33171815
Bug: 30622771
Change-Id: Ib3df1d13535999ede0e820651fc6d69daeb8ef17

diff --git a/src/com/android/bluetooth/gatt/AdvertiseManager.java b/src/com/android/bluetooth/gatt/AdvertiseManager.java
index b41ebd9..ee44a7a 100644 (file)
--- a/src/com/android/bluetooth/gatt/AdvertiseManager.java
+++ b/src/com/android/bluetooth/gatt/AdvertiseManager.java
@@ -137,7 +137,7 @@ class AdvertiseManager {
         }
     }
 
-    private AdvertiseClient getAdvertiseClient(int advertiserId) {
+    public AdvertiseClient getAdvertiseClient(int advertiserId) {
         for (AdvertiseClient client : mAdvertiseClients) {
             if (client.advertiserId == advertiserId) {
                 return client;

diff --git a/src/com/android/bluetooth/gatt/GattService.java b/src/com/android/bluetooth/gatt/GattService.java
index 9485c60..e9a27f6 100644 (file)
--- a/src/com/android/bluetooth/gatt/GattService.java
+++ b/src/com/android/bluetooth/gatt/GattService.java
@@ -1193,8 +1193,10 @@ public class GattService extends ProfileService {
         AdvertiserMap.App app = mAdvertiserMap.getById(advertiserId);
         if (app != null) {
             if (status == 0) {
+                AdvertiseClient client = mAdvertiseManager.getAdvertiseClient(advertiserId);
+                AdvertiseSettings settings = (client == null) ? null : client.settings;
                 app.callback.onMultiAdvertiseCallback(AdvertiseCallback.ADVERTISE_SUCCESS,
-                        true, null);
+                        true, settings);
             } else {
                 app.callback.onMultiAdvertiseCallback(
                         AdvertiseCallback.ADVERTISE_FAILED_INTERNAL_ERROR, true, null);