From 2107bea9c4b1785576bb0f1db459346c4e8ea6f8 Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Fri, 30 Mar 2018 10:19:35 -0400
Subject: [PATCH] Catch unbinding errors

Test: none
Change-Id: Ia8ca50c7c55b86fac84a04a5e4ef2aa36ae6bf6e
Fixes: 72206319
(cherry picked from commit 7e9659fadc308cbe2f33d9915f3461bead791386)
---
 .../com/android/server/notification/ManagedServices.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/notification/ManagedServices.java b/services/core/java/com/android/server/notification/ManagedServices.java
index 625764cea5502..bf37dbe2dbc23 100644
--- a/services/core/java/com/android/server/notification/ManagedServices.java
+++ b/services/core/java/com/android/server/notification/ManagedServices.java
@@ -906,7 +906,11 @@ abstract public class ManagedServices {
                     Slog.w(TAG, getCaption() + " binding died: " + name);
                     synchronized (mMutex) {
                         mServicesBinding.remove(servicesBindingTag);
-                        mContext.unbindService(this);
+                        try {
+                            mContext.unbindService(this);
+                        } catch (IllegalArgumentException e) {
+                            Slog.e(TAG, "failed to unbind " + name, e);
+                        }
                         if (!mServicesRebinding.contains(servicesBindingTag)) {
                             mServicesRebinding.add(servicesBindingTag);
                             mHandler.postDelayed(new Runnable() {