commit 305d30f7862bf3317cef8b65fab9ffb115fd4d1a
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 21 01:42:29 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 21 01:42:33 2017 +0000
tree f23b49557d56f9dc656efd01fb15b982f1d01014
parent dbc020983d90c567a226cabfb96c7f561f1e0cc3
parent e23fa2bc8af631b91dff573b6e2411257fa15934

Merge "OOM-adjust an app to the foreground for startForegroundService" into oc-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 b91ecf5..3fe8a1e 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -825,7 +825,7 @@
         boolean anyForeground = false;
         for (int i=proc.services.size()-1; i>=0; i--) {
             ServiceRecord sr = proc.services.valueAt(i);
-            if (sr.isForeground) {
+            if (sr.isForeground || sr.fgRequired) {
                 anyForeground = true;
                 break;
             }
@@ -1869,7 +1869,7 @@
         final boolean newService = app.services.add(r);
         bumpServiceExecutingLocked(r, execInFg, "create");
         mAm.updateLruProcessLocked(app, false, null);
-        mAm.updateOomAdjLocked();
+        updateServiceForegroundLocked(r.app, true);
 
         boolean created = false;
         try {