diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index bfaf4e8f4b9ab..9cecd8bafc45b 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -4891,6 +4891,10 @@ public final class ActiveServices {
                 if (!pr.mAllowBackgroundActivityStartsTokens.isEmpty()) {
                     return true;
                 }
+                if (pr.getWindowProcessController()
+                        .areBackgroundActivityStartsAllowedByGracePeriodSafe()) {
+                    return true;
+                }
             }
         }
 
diff --git a/services/core/java/com/android/server/wm/WindowProcessController.java b/services/core/java/com/android/server/wm/WindowProcessController.java
index df49ac71334f9..e6a35f1267b55 100644
--- a/services/core/java/com/android/server/wm/WindowProcessController.java
+++ b/services/core/java/com/android/server/wm/WindowProcessController.java
@@ -455,15 +455,13 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
         mAllowBackgroundActivityStarts = allowBackgroundActivityStarts;
     }
 
-    boolean areBackgroundActivityStartsAllowed() {
-        // allow if the whitelisting flag was explicitly set
-        if (mAllowBackgroundActivityStarts) {
-            if (DEBUG_ACTIVITY_STARTS) {
-                Slog.d(TAG, "[WindowProcessController(" + mPid
-                        + ")] Activity start allowed: mAllowBackgroundActivityStarts = true");
-            }
-            return true;
+    public boolean areBackgroundActivityStartsAllowedByGracePeriodSafe() {
+        synchronized (mAtm.mGlobalLockWithoutBoost) {
+            return areBackgroundActivityStartsAllowedByGracePeriod();
         }
+    }
+
+    boolean areBackgroundActivityStartsAllowedByGracePeriod() {
         // allow if any activity in the caller has either started or finished very recently, and
         // it must be started or finished after last stop app switches time.
         final long now = SystemClock.uptimeMillis();
@@ -485,8 +483,24 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
                         + ACTIVITY_BG_START_GRACE_PERIOD_MS
                         + "ms grace period but also within stop app switch window");
             }
-
         }
+        return false;
+    }
+
+    boolean areBackgroundActivityStartsAllowed() {
+        // allow if the whitelisting flag was explicitly set
+        if (mAllowBackgroundActivityStarts) {
+            if (DEBUG_ACTIVITY_STARTS) {
+                Slog.d(TAG, "[WindowProcessController(" + mPid
+                        + ")] Activity start allowed: mAllowBackgroundActivityStarts = true");
+            }
+            return true;
+        }
+
+        if (areBackgroundActivityStartsAllowedByGracePeriod()) {
+            return true;
+        }
+
         // allow if the proc is instrumenting with background activity starts privs
         if (mInstrumentingWithBackgroundActivityStartPrivileges) {
             if (DEBUG_ACTIVITY_STARTS) {