commit 6c2af1afa2a0efca3453124aa7cb05683d89090c
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 20 19:31:42 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 20 19:31:42 2018 +0000
tree d75e9ed8b1ecad9abe840a2adf37c57fc6f0e466
parent 12a6cd7457c9bc402a41404eda009a0c82ed49ae
parent 33ecd1bca766416bb8e7d5bd4cdf12cc4d3d6445

Merge "Catch double unbind of dead service" into pi-dev

services/core/java/com/android/server/notification/ManagedServices.java

diff --git a/services/core/java/com/android/server/notification/ManagedServices.java b/services/core/java/com/android/server/notification/ManagedServices.java
index 4c8b91b..477b062 100644
--- a/services/core/java/com/android/server/notification/ManagedServices.java
+++ b/services/core/java/com/android/server/notification/ManagedServices.java
@@ -926,7 +926,11 @@
                 Slog.v(TAG, "    disconnecting old " + getCaption() + ": " + info.service);
                 removeServiceLocked(i);
                 if (info.connection != null) {
-                    mContext.unbindService(info.connection);
+                    try {
+                        mContext.unbindService(info.connection);
+                    } catch (IllegalArgumentException e) {
+                        Slog.e(TAG, "failed to unbind " + name, e);
+                    }
                 }
             }
         }