commit d2fdd006bd790a9c9853a44a456191568ff87cec
author Dianne Hackborn <hackbod@google.com> Fri Sep 26 04:55:47 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 26 04:55:47 2014 +0000
tree 957d25be7e2f30e6bd4283bda6612658e784faa3
parent ad667371b18dba344f92b16db2be739a4bdf5f52
parent a5423caca34b00536794cd01eae1955f5354b2da

am 265b2320: am c656d219: am 34b63d50: Merge "Fix issue #17574819: Chrome browser process is killed..." into lmp-dev

* commit '265b2320450ea08ba075b3cbffb34b71d355f1a3':
  Fix issue #17574819: Chrome browser process is killed...

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()