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

2010-12-23 14:14:38 -08:00
parent 3b10aea50c 50b9b94411
commit 6c5d151b29
1 changed files with 8 additions and 0 deletions
--- 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,