commit d42488dd8e17ba55f827f28f522543449d348e9a
author Dianne Hackborn <hackbod@google.com> Fri Sep 19 23:38:21 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 19 23:38:21 2014 +0000
tree 24a871938198b94adf22b5fbeac19c13203b1007
parent ec612b25f4c45c3455ccbbef37405ed88befd4ac
parent cf456e3c225fa736914cca1f51eb5311fa16fb88

am 8a9df5a2: Merge "Fix issue #17574819: Chrome browser process is killed in background..." into lmp-dev

* commit '8a9df5a21c166218ace936e1443948500ed0792f':
  Fix issue #17574819: Chrome browser process is killed in background...

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 3f83a02..1f537be 100755
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -2119,7 +2119,8 @@
                     boolean hasCreate = false;
                     for (int conni=abind.connections.size()-1; conni>=0; conni--) {
                         ConnectionRecord conn = abind.connections.valueAt(conni);
-                        if ((conn.flags&Context.BIND_AUTO_CREATE) != 0) {
+                        if ((conn.flags&(Context.BIND_AUTO_CREATE|Context.BIND_ALLOW_OOM_MANAGEMENT
+                                |Context.BIND_WAIVE_PRIORITY)) == Context.BIND_AUTO_CREATE) {
                             hasCreate = true;
                             break;
                         }