Merge "Remove GATT context if client registration did not succeed" into lmp-mr1-dev

2 files changed, 23 insertions, 2 deletions

diff --git a/src/com/android/bluetooth/gatt/ContextMap.java b/src/com/android/bluetooth/gatt/ContextMap.java
index bdb82b5d8..1b40bc0d8 100644
--- a/src/com/android/bluetooth/gatt/ContextMap.java
+++ b/src/com/android/bluetooth/gatt/ContextMap.java
@@ -134,6 +134,23 @@ import java.util.UUID;
     }
 
     /**
+     * Remove the context for a given UUID
+     */
+    void remove(UUID uuid) {
+        synchronized (mApps) {
+            Iterator<App> i = mApps.iterator();
+            while(i.hasNext()) {
+                App entry = i.next();
+                if (entry.uuid.equals(uuid)) {
+                    entry.unlinkToDeath();
+                    i.remove();
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
      * Remove the context for a given application ID.
      */
     void remove(int id) {
diff --git a/src/com/android/bluetooth/gatt/GattService.java b/src/com/android/bluetooth/gatt/GattService.java
index ecda6226e..c428cf832 100644
--- a/src/com/android/bluetooth/gatt/GattService.java
+++ b/src/com/android/bluetooth/gatt/GattService.java
@@ -638,8 +638,12 @@ public class GattService extends ProfileService {
         if (DBG) Log.d(TAG, "onClientRegistered() - UUID=" + uuid + ", clientIf=" + clientIf);
         ClientMap.App app = mClientMap.getByUuid(uuid);
         if (app != null) {
-            app.id = clientIf;
-            app.linkToDeath(new ClientDeathRecipient(clientIf));
+            if (status == 0) {
+                app.id = clientIf;
+                app.linkToDeath(new ClientDeathRecipient(clientIf));
+            } else {
+                mClientMap.remove(uuid);
+            }
             app.callback.onClientRegistered(status, clientIf);
         }
     }