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

Dianne Hackborn · Android (Google) Code Review · commit 6eef0ca59438 · 2010-12-23T14:19:03.000-08:00
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
@@ -9093,6 +9093,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
`@@ -9093,6 +9093,14 @@ private final void bringDownServiceLocked(ServiceRecord r, boolean force) {`
`9093`	`9093`	`if (DEBUG_SERVICE) Slog.v(`
`9094`	`9094`	`TAG, "Removed service that is not running: " + r);`
`9095`	`9095`	`}`
	`9096`	`+`
	`9097`	`+ if (r.bindings.size() > 0) {`
	`9098`	`+ r.bindings.clear();`
	`9099`	`+ }`
	`9100`	`+`
	`9101`	`+ if (r.restarter instanceof ServiceRestarter) {`
	`9102`	`+ ((ServiceRestarter)r.restarter).setService(null);`
	`9103`	`+ }`
`9096`	`9104`	`}`
`9097`	`9105`
`9098`	`9106`	`ComponentName startServiceLocked(IApplicationThread caller,`