commit fefe3f689b0c1838d7a68c0d6275ab4d9f294636
author Dianne Hackborn <hackbod@google.com> Thu Dec 23 14:29:36 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 23 14:29:36 2010 -0800
tree 70d2a3c7755b8b2792aae5a87295cde832ee3476
parent 8b71943942941d4404be2758b1ac817f1692264f
parent cc43401cd10c681238e0be01de8fe14f5da94fb1

am cc43401c: am 6eef0ca5: Merge "frameworks/base: Fix to release references in ActivityManagerService" into gingerbread

* commit 'cc43401cd10c681238e0be01de8fe14f5da94fb1':
  frameworks/base: Fix to release references in ActivityManagerService

services/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 4cf01aa..e0397b1 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -9411,6 +9411,14 @@
             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,