commit 2d1cc187632ed84f66a9618788562337fb81123f
author Dianne Hackborn <hackbod@google.com> Fri Sep 26 01:41:53 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 26 01:41:54 2014 +0000
tree 2ee5051923f6ed083516a7eaf3d8706713336ce4
parent fbe3d39dd5f9291bb5f820d107d1dd2ca7bafe9d
parent cd97c96734ac00a6a800724fe5d8e81ee0ee134c

Merge "Fix issue #17574819: Chrome browser process is killed..." into lmp-dev

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

diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index 8e8e4a6..01e80b7 100755
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -2134,7 +2134,8 @@
                     if (!hasCreate) {
                         continue;
                     }
-                    if (proc != null && !proc.persistent && proc.thread != null
+                    // XXX turned off for now until we have more time to get a better policy.
+                    if (false && proc != null && !proc.persistent && proc.thread != null
                             && proc.pid != 0 && proc.pid != ActivityManagerService.MY_PID
                             && proc.setProcState >= ActivityManager.PROCESS_STATE_LAST_ACTIVITY) {
                         proc.kill("bound to service " + sr.name.flattenToShortString()