summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2014-01-13 18:51:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-13 18:51:24 +0000
commit4bc9432f2876097d041955d4be76ec73533082b3 (patch)
tree7a6ce779b25338005ef5dd810c0b34b13e359f0d /services
parent8a3452e7e1cc7b6edf719b155e9d95ec8fbf573a (diff)
parent38c65b1f70042bc8e37e91106692158f0ce98703 (diff)
downloadframeworks_base-4bc9432f2876097d041955d4be76ec73533082b3.zip
frameworks_base-4bc9432f2876097d041955d4be76ec73533082b3.tar.gz
frameworks_base-4bc9432f2876097d041955d4be76ec73533082b3.tar.bz2
am 38c65b1f: am 6fba240b: am 6d3700b3: am 47235e8b: am 90cadb35: Merge "MountService listeners can not be unregistered"
* commit '38c65b1f70042bc8e37e91106692158f0ce98703': MountService listeners can not be unregistered
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/MountService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java
index e60231a..0d535cc 100644
--- a/services/core/java/com/android/server/MountService.java
+++ b/services/core/java/com/android/server/MountService.java
@@ -1411,7 +1411,7 @@ class MountService extends IMountService.Stub
public void unregisterListener(IMountServiceListener listener) {
synchronized (mListeners) {
for(MountServiceBinderListener bl : mListeners) {
- if (bl.mListener == listener) {
+ if (bl.mListener.asBinder() == listener.asBinder()) {
mListeners.remove(mListeners.indexOf(bl));
listener.asBinder().unlinkToDeath(bl, 0);
return;