summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorriddle_hsu <riddle_hsu@htc.com>2014-07-04 12:37:45 +0800
committerriddle hsu <riddle_hsu@htc.com>2014-07-04 13:33:19 +0000
commitabc69e93d65cdee7673abd2d0a734df7be01b96c (patch)
treefa94536c415fd96e8fe0e651c66d77300ab8d2c1
parenta6e9dd3f9a2d966faf2d1710d2189127b968dc52 (diff)
downloadframeworks_base-abc69e93d65cdee7673abd2d0a734df7be01b96c.zip
frameworks_base-abc69e93d65cdee7673abd2d0a734df7be01b96c.tar.gz
frameworks_base-abc69e93d65cdee7673abd2d0a734df7be01b96c.tar.bz2
[ActivityManager] Ensure alive process is not killedByAm.
Symptom: Unable to kill by Am again and will be skipped updating its oom adj. Root Cause: A restarted process will reuse original process record. The flag killedByAm will keep previous state. Solution: Reset the flag killedByAm to false when the process is started. Note: Found another similiar patch If95137d91939cc44882ad2813131bcde0edd0c1b Change-Id: I59a86648ca8d0aed4c489d92751af120aae5ef90
-rwxr-xr-x[-rw-r--r--]services/java/com/android/server/am/ActivityManagerService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index baeced7..3e79eae 100644..100755
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -2839,6 +2839,7 @@ public final class ActivityManagerService extends ActivityManagerNative
app.setPid(startResult.pid);
app.usingWrapper = startResult.usingWrapper;
app.removed = false;
+ app.killedByAm = false;
synchronized (mPidsSelfLocked) {
this.mPidsSelfLocked.put(startResult.pid, app);
Message msg = mHandler.obtainMessage(PROC_START_TIMEOUT_MSG);