commit d07b9ea63dc37eaaf28bdf91b2edae62e2b35ee1
author Olawale Ogunwale <ogunwale@google.com> Mon Jan 12 16:44:12 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 12 16:44:12 2015 +0000
tree 5c61a8675a3db31e987a78b07870602be42285d6
parent 60d791c8640b30331ee710551e5fdc642fb432ff
parent a9ae505053585b6c46a6a86475959fd9fe501b09

am a9ae5050: am 8ddd5f4c: Merge "[ActivityManager] Fix process record leakage."

* commit 'a9ae505053585b6c46a6a86475959fd9fe501b09':
  [ActivityManager] Fix process record leakage.

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 8b0e935..423c7af 100755
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -5831,6 +5831,7 @@
             // Take care of any services that are waiting for the process.
             mServices.processStartTimedOutLocked(app);
             app.kill("start timeout", true);
+            removeLruProcessLocked(app);
             if (mBackupTarget != null && mBackupTarget.app.pid == pid) {
                 Slog.w(TAG, "Unattached app died before backup, skipping");
                 try {