Merge "Clean up binding list on error" into oc-mr1-dev

2017-08-18 17:55:46 +00:00
parent a528ee13bd 72b411778c
commit 563e4982a9
1 changed files with 2 additions and 0 deletions
--- 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);
        }
    }