diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java
index 57214e06bb9a6..2a390a7dbb51d 100644
--- a/core/java/android/app/ActivityOptions.java
+++ b/core/java/android/app/ActivityOptions.java
@@ -1997,10 +1997,12 @@ public class ActivityOptions extends ComponentOptions {
 
     /**
      * Sets background activity launch logic won't use pending intent creator foreground state.
+     *
      * @hide
      */
-    public void setIgnorePendingIntentCreatorForegroundState(boolean state) {
+    public ActivityOptions setIgnorePendingIntentCreatorForegroundState(boolean state) {
         mIgnorePendingIntentCreatorForegroundState = state;
+        return this;
     }
 
     /**
diff --git a/services/core/java/com/android/server/wm/SafeActivityOptions.java b/services/core/java/com/android/server/wm/SafeActivityOptions.java
index 8a6ddf658c2ab..98ca9aecc7067 100644
--- a/services/core/java/com/android/server/wm/SafeActivityOptions.java
+++ b/services/core/java/com/android/server/wm/SafeActivityOptions.java
@@ -143,7 +143,11 @@ public class SafeActivityOptions {
                 .setLaunchTaskDisplayArea(options.getLaunchTaskDisplayArea())
                 .setLaunchDisplayId(options.getLaunchDisplayId())
                 .setCallerDisplayId(options.getCallerDisplayId())
-                .setLaunchRootTask(options.getLaunchRootTask());
+                .setLaunchRootTask(options.getLaunchRootTask())
+                .setPendingIntentBackgroundActivityStartMode(
+                        options.getPendingIntentBackgroundActivityStartMode())
+                .setIgnorePendingIntentCreatorForegroundState(
+                        options.getIgnorePendingIntentCreatorForegroundState());
     }
 
     /**