diff options
| author | Suchi Amalapurapu <asuchitra@google.com> | 2009-06-30 21:36:16 -0700 |
|---|---|---|
| committer | Suchi Amalapurapu <asuchitra@google.com> | 2009-07-01 12:55:30 -0700 |
| commit | fff2fda0199dedbf1079454dca98a81190dce765 (patch) | |
| tree | c45c5960e5c3469b36b5d728378a1aa901d1ec4e /core | |
| parent | c56096fe1fe3486102079f06ca5de3e2bef12e47 (diff) | |
| download | frameworks_base-fff2fda0199dedbf1079454dca98a81190dce765.zip frameworks_base-fff2fda0199dedbf1079454dca98a81190dce765.tar.gz frameworks_base-fff2fda0199dedbf1079454dca98a81190dce765.tar.bz2 | |
Fix memory leaks in system_server
unlink DeathRecipients in a whole bunch of places to avoid memory leaks
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 62dc651..5ee29ac 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -3981,7 +3981,10 @@ public final class ActivityThread { ProviderRecord pr = mProviderMap.get(name); if (pr.mProvider.asBinder() == provider.asBinder()) { Log.i(TAG, "Removing dead content provider: " + name); - mProviderMap.remove(name); + ProviderRecord removed = mProviderMap.remove(name); + if (removed != null) { + removed.mProvider.asBinder().unlinkToDeath(removed, 0); + } } } } @@ -3990,7 +3993,10 @@ public final class ActivityThread { ProviderRecord pr = mProviderMap.get(name); if (pr.mProvider.asBinder() == provider.asBinder()) { Log.i(TAG, "Removing dead content provider: " + name); - mProviderMap.remove(name); + ProviderRecord removed = mProviderMap.remove(name); + if (removed != null) { + removed.mProvider.asBinder().unlinkToDeath(removed, 0); + } } } |