Merge "Compare binder instances when checking if listeners match." into jb-mr2-dev

1 files changed, 2 insertions, 1 deletions

diff --git a/services/java/com/android/server/NotificationManagerService.java b/services/java/com/android/server/NotificationManagerService.java
index 868278b0748c..04773db67d13 100644
--- a/services/java/com/android/server/NotificationManagerService.java
+++ b/services/java/com/android/server/NotificationManagerService.java
@@ -763,7 +763,8 @@ public class NotificationManagerService extends INotificationManager.Stub
             final int N = mListeners.size();
             for (int i=N-1; i>=0; i--) {
                 final NotificationListenerInfo info = mListeners.get(i);
-                if (info.listener == listener && info.userid == userid) {
+                if (info.listener.asBinder() == listener.asBinder()
+                        && info.userid == userid) {
                     mListeners.remove(i);
                     if (info.connection != null) {
                         mContext.unbindService(info.connection);