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 /core | |
| 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 '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); + } } } |