Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0393d26f authored by Vladislav Kaznacheev's avatar Vladislav Kaznacheev Committed by android-build-merger
Browse files

Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev am: 7d2a0a05 

am: 46d24970

* commit '46d24970':
  Add @TestApi to ActivityOptions.setLaunchStackId

Change-Id: I4712bb84a994379c86d651ebc946478130d80daa
parents 34fe9e0e 46d24970

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

core/java/android/app/ActivityOptions.java

+2 −0
Original line number Diff line number Diff line
@@ -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;

    }