Merge "frameworks/base: Fix to release references in ActivityManagerService"

Dianne Hackborn · Android Code Review · commit 6c5d151b29d7 · 2010-12-23T14:14:38.000-08:00
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
@@ -9120,6 +9120,14 @@ private final void bringDownServiceLocked(ServiceRecord r, boolean force) {
             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,

Original file line number	Diff line number	Diff line change
`@@ -9120,6 +9120,14 @@ private final void bringDownServiceLocked(ServiceRecord r, boolean force) {`
`9120`	`9120`	`if (DEBUG_SERVICE) Slog.v(`
`9121`	`9121`	`TAG, "Removed service that is not running: " + r);`
`9122`	`9122`	`}`
	`9123`	`+`
	`9124`	`+ if (r.bindings.size() > 0) {`
	`9125`	`+ r.bindings.clear();`
	`9126`	`+ }`
	`9127`	`+`
	`9128`	`+ if (r.restarter instanceof ServiceRestarter) {`
	`9129`	`+ ((ServiceRestarter)r.restarter).setService(null);`
	`9130`	`+ }`
`9123`	`9131`	`}`
`9124`	`9132`
`9125`	`9133`	`ComponentName startServiceLocked(IApplicationThread caller,`