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

Commit 2d1f0681 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert part of previous change."

parents 8a482a1b c7dc8708

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

+3 −5
Original line number Diff line number Diff line
@@ -493,11 +493,6 @@ public final class ActiveServices { 
        }



        ServiceRecord r = res.record;



        if (allowBackgroundActivityStarts) {

            r.allowBgActivityStartsOnServiceStart();

        }



        setFgsRestrictionLocked(callingPackage, callingPid, callingUid, service, r,

                allowBackgroundActivityStarts);
@@ -710,6 +705,9 @@ public final class ActiveServices { 
                        "Not potential delay (user " + r.userId + " not started): " + r);

            }

        }

        if (allowBackgroundActivityStarts) {

            r.allowBgActivityStartsOnServiceStart();

        }

        ComponentName cmp = startServiceInnerLocked(smap, service, r, callerFg, addToStarting);

        return cmp;

    }