summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kazuki Nakayama <kazuki.x.nakayama@sonymobile.com> 2014-05-29 16:05:34 +0900
committer Wale Ogunwale <ogunwale@google.com> 2014-11-26 15:07:33 -0800
commit609cb91c9cbb94c792e1fe50f6d762f498d6bcc8 (patch)
treef3d62f34dcc4842524d5930cd0e074a7741f78bc
parentb802cd6767c43a85645279a67bb41320058fdb60 (diff)
Reset killedByAm flag at attachApplicationLocked
ActivityManager reuses a process record object that killed by him under some situation. That reused process record inherits a killedByAm flag unexpectedly. The killedByAm flag must be reset otherwise ActivityManager can't judge the process can be killed or not. Change-Id: If95137d91939cc44882ad2813131bcde0edd0c1b
-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 9185adabb564..3b7680ada21d 100755
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -6098,6 +6098,7 @@ public final class ActivityManagerService extends ActivityManagerNative
app.hasShownUi = false;
app.debugging = false;
app.cached = false;
+ app.killedByAm = false;
mHandler.removeMessages(PROC_START_TIMEOUT_MSG, app);