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

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

Merge "Mark uid as non-idle/FG-entitled when launching for fg service" into... 

Merge "Mark uid as non-idle/FG-entitled when launching for fg service" into oc-mr1-dev am: 93243bf8
am: b39679d4

Change-Id: I9284ceee64957730cb6a9e0cd8542ae528808a8c
parents 91d90440 b39679d4

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

+9 −0
Original line number Diff line number Diff line
@@ -2162,6 +2162,15 @@ public final class ActiveServices { 
            }

        }



        if (r.fgRequired) {

            if (DEBUG_FOREGROUND_SERVICE) {

                Slog.v(TAG, "Whitelisting " + UserHandle.formatUid(r.appInfo.uid)

                        + " for fg-service launch");

            }

            mAm.tempWhitelistUidLocked(r.appInfo.uid,

                    SERVICE_START_FOREGROUND_TIMEOUT, "fg-service-launch");

        }



        if (!mPendingServices.contains(r)) {

            mPendingServices.add(r);

        }