From 152942be13c422e475ec1e323e2a885bf988cd0a Mon Sep 17 00:00:00 2001
From: Andrew Wilson <anwilson@google.com>
Date: Wed, 22 May 2013 09:35:35 -0700
Subject: [PATCH] Compare binder instances when checking if listeners match.

Bug: 9069919
Change-Id: I06130105cb703de35de76ab2fceba3855fa5407a
---
 .../java/com/android/server/NotificationManagerService.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/java/com/android/server/NotificationManagerService.java b/services/java/com/android/server/NotificationManagerService.java
index 4348a81178f30..350b406e16898 100644
--- a/services/java/com/android/server/NotificationManagerService.java
+++ b/services/java/com/android/server/NotificationManagerService.java
@@ -762,7 +762,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);