summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlawale Ogunwale <ogunwale@google.com>2015-01-12 13:44:15 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-01-12 13:44:17 +0000
commit8ddd5f4cd6e0619bbcf374ce073f4bc8acdbb182 (patch)
treed5b8dfab0657aae00119b1c465b37b8d5574418e
parent7f94b52fc7c66bc40702b46f59b3929c076cbbfb (diff)
parent22242ab29a5be21c5248d0cb366de3d5fcb554e8 (diff)
downloadframeworks_base-8ddd5f4cd6e0619bbcf374ce073f4bc8acdbb182.zip
frameworks_base-8ddd5f4cd6e0619bbcf374ce073f4bc8acdbb182.tar.gz
frameworks_base-8ddd5f4cd6e0619bbcf374ce073f4bc8acdbb182.tar.bz2
Merge "[ActivityManager] Fix process record leakage."
-rwxr-xr-xservices/core/java/com/android/server/am/ActivityManagerService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index e3f7fb3..0b82b3c 100755
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -6018,6 +6018,7 @@ public final class ActivityManagerService extends ActivityManagerNative
// 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 {