diff --git a/api/test-current.txt b/api/test-current.txt
index c3866b43be888..3a51e758308f4 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -3867,6 +3867,7 @@ package android.app {
     method public static android.app.ActivityOptions makeThumbnailScaleUpAnimation(android.view.View, android.graphics.Bitmap, int, int);
     method public void requestUsageTimeReport(android.app.PendingIntent);
     method public android.app.ActivityOptions setLaunchBounds(android.graphics.Rect);
+    method public void setLaunchStackId(int);
     method public android.os.Bundle toBundle();
     method public void update(android.app.ActivityOptions);
     field public static final java.lang.String EXTRA_USAGE_TIME_REPORT = "android.activity.usage_time";
diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java
index 051295e450fa7..a30f6299a4d94 100644
--- a/core/java/android/app/ActivityOptions.java
+++ b/core/java/android/app/ActivityOptions.java
@@ -20,6 +20,7 @@ import static android.app.ActivityManager.DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT;
 import static android.app.ActivityManager.StackId.INVALID_STACK_ID;
 
 import android.annotation.Nullable;
+import android.annotation.TestApi;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -939,6 +940,7 @@ public class ActivityOptions {
     }
 
     /** @hide */
+    @TestApi
     public void setLaunchStackId(int launchStackId) {
         mLaunchStackId = launchStackId;
     }