From acf147e7e3c603c3c28c390c1d304f451193557a Mon Sep 17 00:00:00 2001
From: Vladislav Kaznacheev <kaznacheev@google.com>
Date: Thu, 5 May 2016 09:32:27 -0700
Subject: [PATCH] Add @TestApi to ActivityOptions.setLaunchStackId

Bug: 28506739
Change-Id: I20fe4d080c125b38a84d9832a497340f805e82e7
---
 api/test-current.txt                       | 1 +
 core/java/android/app/ActivityOptions.java | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/api/test-current.txt b/api/test-current.txt
index 8764333ef2a8f..f4d32e0ad0285 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -3869,6 +3869,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;
     }