summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Wilson <anwilson@google.com>2013-05-23 18:47:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-05-23 18:47:48 +0000
commit55bf965e89df5986a7a988c2b1ec2cd9f01edb56 (patch)
tree89ed2b6784adce4abab197a4e119bef2fefbf2e2
parentcfbbc864da1b7a9ed64807f9072c5730c421b4ef (diff)
parent152942be13c422e475ec1e323e2a885bf988cd0a (diff)
downloadframeworks_base-55bf965e89df5986a7a988c2b1ec2cd9f01edb56.zip
frameworks_base-55bf965e89df5986a7a988c2b1ec2cd9f01edb56.tar.gz
frameworks_base-55bf965e89df5986a7a988c2b1ec2cd9f01edb56.tar.bz2
Merge "Compare binder instances when checking if listeners match." into jb-mr2-dev
-rw-r--r--services/java/com/android/server/NotificationManagerService.java3
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 868278b..04773db 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);