Merge "Revert part of previous change."

2020-08-13 22:45:40 +00:00
parent 8a482a1bca c7dc87088e
commit 2d1f06818b
1 changed files with 3 additions and 5 deletions
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -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;
    }