diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-12-23 14:22:32 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-23 14:22:32 -0800 |
| commit | cc43401cd10c681238e0be01de8fe14f5da94fb1 (patch) | |
| tree | 1586fe3790cc35955975b555e0454b86a83d50b7 /services | |
| parent | fa93584a4fab6ca8d9348658dc30cedf76891753 (diff) | |
| parent | 6eef0ca59438a15d14be8a72b6b29f01da91a5b8 (diff) | |
| download | frameworks_base-cc43401cd10c681238e0be01de8fe14f5da94fb1.zip frameworks_base-cc43401cd10c681238e0be01de8fe14f5da94fb1.tar.gz frameworks_base-cc43401cd10c681238e0be01de8fe14f5da94fb1.tar.bz2 | |
am 6eef0ca5: Merge "frameworks/base: Fix to release references in ActivityManagerService" into gingerbread
* commit '6eef0ca59438a15d14be8a72b6b29f01da91a5b8':
frameworks/base: Fix to release references in ActivityManagerService
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 6a05d3c..16cd62b 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -9120,6 +9120,14 @@ public final class ActivityManagerService extends ActivityManagerNative if (DEBUG_SERVICE) Slog.v( TAG, "Removed service that is not running: " + r); } + + if (r.bindings.size() > 0) { + r.bindings.clear(); + } + + if (r.restarter instanceof ServiceRestarter) { + ((ServiceRestarter)r.restarter).setService(null); + } } ComponentName startServiceLocked(IApplicationThread caller, |