From 72b411778cfdbb519ea20ac3ce774ff23f114e45 Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Fri, 18 Aug 2017 09:21:36 -0400
Subject: [PATCH] Clean up binding list on error

So that we can try again

Test: manual
Change-Id: I6be1e8d0377930d52c599261a7381c1e377cbcfc
Fixes: 64458792
---
 .../java/com/android/server/notification/ManagedServices.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/core/java/com/android/server/notification/ManagedServices.java b/services/core/java/com/android/server/notification/ManagedServices.java
index beaddb4c72dde..d5d0250f82af6 100644
--- a/services/core/java/com/android/server/notification/ManagedServices.java
+++ b/services/core/java/com/android/server/notification/ManagedServices.java
@@ -877,6 +877,7 @@ abstract public class ManagedServices {
 
                 @Override
                 public void onServiceDisconnected(ComponentName name) {
+                    mServicesBinding.remove(servicesBindingTag);
                     Slog.v(TAG, getCaption() + " connection lost: " + name);
                 }
             };
@@ -889,6 +890,7 @@ abstract public class ManagedServices {
                 return;
             }
         } catch (SecurityException ex) {
+            mServicesBinding.remove(servicesBindingTag);
             Slog.e(TAG, "Unable to bind " + getCaption() + " service: " + intent, ex);
         }
     }