diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-02 15:23:56 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-07-02 15:23:56 -0700 |
commit | 0d0012ef1617170701b9cd7492ef04ac47bfb5ca (patch) | |
tree | 01b85c97f37b1356b723187578157e4f443de4c8 /services/java/com/android/server/WifiService.java | |
parent | 1c502a4624859289c1000af6be8bea1aacee41bd (diff) | |
parent | 54af78a3f7064e04d7ebd64c985d4149f9f7b05c (diff) | |
download | frameworks_base-0d0012ef1617170701b9cd7492ef04ac47bfb5ca.zip frameworks_base-0d0012ef1617170701b9cd7492ef04ac47bfb5ca.tar.gz frameworks_base-0d0012ef1617170701b9cd7492ef04ac47bfb5ca.tar.bz2 |
am 54af78a3: Merge change 5950 into donut
Merge commit '54af78a3f7064e04d7ebd64c985d4149f9f7b05c'
* commit '54af78a3f7064e04d7ebd64c985d4149f9f7b05c':
Fix memory leaks in system_server
Diffstat (limited to 'services/java/com/android/server/WifiService.java')
-rw-r--r-- | services/java/com/android/server/WifiService.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java index e91798b..4984b19 100644 --- a/services/java/com/android/server/WifiService.java +++ b/services/java/com/android/server/WifiService.java @@ -1883,7 +1883,9 @@ public class WifiService extends IWifiManager.Stub { private WifiLock removeLock(IBinder binder) { int index = findLockByBinder(binder); if (index >= 0) { - return mList.remove(index); + WifiLock ret = mList.remove(index); + ret.unlinkDeathRecipient(); + return ret; } else { return null; } @@ -1995,6 +1997,10 @@ public class WifiService extends IWifiManager.Stub { binderDied(); } } + + void unlinkDeathRecipient() { + mBinder.unlinkToDeath(this, 0); + } } private class Multicaster extends DeathRecipient { @@ -2062,7 +2068,10 @@ public class WifiService extends IWifiManager.Stub { private void removeMulticasterLocked(int i, int uid) { - mMulticasters.remove(i); + Multicaster removed = mMulticasters.remove(i); + if (removed != null) { + removed.unlinkDeathRecipient(); + } if (mMulticasters.size() == 0) { WifiNative.startPacketFiltering(); } |