Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81d53bf4 authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

Merge "OOM-adjust an app to the foreground for startForegroundService" into oc-dev 

am: 305d30f7

Change-Id: Ifb52cf1189b3aa15b7bee12e1071130e77bef5d1
parents 4a635694 305d30f7

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

+2 −2
Original line number Diff line number Diff line
@@ -825,7 +825,7 @@ public final class ActiveServices { 
        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 @@ public final class ActiveServices { 
        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 {