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

* commit '941a19d269bc36a986d238bbbd0ff85372a700cf':
  Fix issue #17574819: Chrome browser process is killed...
This commit is contained in:
Dianne Hackborn
2014-09-26 05:04:16 +00:00
committed by Android Git Automerger

View File

@@ -2134,7 +2134,8 @@ public final class ActiveServices {
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()