diff options
| author | Daniel Sandler <dsandler@android.com> | 2013-05-09 17:29:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-09 17:29:05 +0000 |
| commit | 60ac308e1da302716fd6c5d805c513221039bac2 (patch) | |
| tree | 2113349f970db62fb987f7cae4b8bd594a9ffb49 /services | |
| parent | cb35969708e88057bda7c54c7b3ac1d606ad95c5 (diff) | |
| parent | c1b49bd26b2d306854f8392693a7c980172bc507 (diff) | |
| download | frameworks_base-60ac308e1da302716fd6c5d805c513221039bac2.zip frameworks_base-60ac308e1da302716fd6c5d805c513221039bac2.tar.gz frameworks_base-60ac308e1da302716fd6c5d805c513221039bac2.tar.bz2 | |
Merge "Defend against a system server crash." into jb-mr2-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/NotificationManagerService.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/services/java/com/android/server/NotificationManagerService.java b/services/java/com/android/server/NotificationManagerService.java index cc74b92..6b38f89 100644 --- a/services/java/com/android/server/NotificationManagerService.java +++ b/services/java/com/android/server/NotificationManagerService.java @@ -727,7 +727,13 @@ public class NotificationManagerService extends INotificationManager.Stub && info.userid == userid) { mListeners.remove(i); if (info.connection != null) { - mContext.unbindService(info.connection); + try { + mContext.unbindService(info.connection); + } catch (IllegalArgumentException ex) { + // something happened to the service: we think we have a connection + // but it's bogus. + Slog.e(TAG, "Listener " + name + " could not be unbound: " + ex); + } } } } |