diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-01 12:52:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-01 12:52:39 -0700 |
| commit | 54af78a3f7064e04d7ebd64c985d4149f9f7b05c (patch) | |
| tree | 319681ef2905159095a4aa89f1165058b22bbca8 /core | |
| parent | 49401ddb9ac11ad5caead4e4cefcaa81d2418ed2 (diff) | |
| parent | fff2fda0199dedbf1079454dca98a81190dce765 (diff) | |
| download | frameworks_base-54af78a3f7064e04d7ebd64c985d4149f9f7b05c.zip frameworks_base-54af78a3f7064e04d7ebd64c985d4149f9f7b05c.tar.gz frameworks_base-54af78a3f7064e04d7ebd64c985d4149f9f7b05c.tar.bz2 | |
Merge change 5950 into donut
* changes:
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); + } } } |