Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make ActivityOptions#setLaunchTaskId a system API" into sc-v2-dev

Browse Source
This commit is contained in:
Tom Natan
2021-10-21 16:21:03 +00:00
committed by Android (Google) Code Review
parent aeb4f22e3b d223334e60
commit fdf0378b8d
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/api/system-current.txt
View File

@@ -437,6 +437,11 @@ package android.app {
method public void onUidImportance(int, int);
}
public class ActivityOptions {
method public int getLaunchTaskId();
method @RequiresPermission("android.permission.START_TASKS_FROM_RECENTS") public void setLaunchTaskId(int);
}
public class AlarmManager {
method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void set(int, long, long, long, android.app.PendingIntent, android.os.WorkSource);
method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void set(int, long, long, long, android.app.AlarmManager.OnAlarmListener, android.os.Handler, android.os.WorkSource);

1
core/api/test-current.txt
View File

@@ -144,7 +144,6 @@ package android.app {
method @NonNull @RequiresPermission(android.Manifest.permission.START_TASKS_FROM_RECENTS) public static android.app.ActivityOptions makeCustomTaskAnimation(@NonNull android.content.Context, int, int, @Nullable android.os.Handler, @Nullable android.app.ActivityOptions.OnAnimationStartedListener, @Nullable android.app.ActivityOptions.OnAnimationFinishedListener);
method public static void setExitTransitionTimeout(long);
method public void setLaunchActivityType(int);
method public void setLaunchTaskId(int);
method public void setLaunchWindowingMode(int);
method public void setLaunchedFromBubble(boolean);
method public void setTaskAlwaysOnTop(boolean);

5
core/java/android/app/ActivityOptions.java
View File

@@ -26,6 +26,7 @@ import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.app.ExitTransitionCoordinator.ActivityExitTransitionCallbacks;
import android.app.ExitTransitionCoordinator.ExitTransitionCallbacks;
@@ -1521,7 +1522,8 @@ public class ActivityOptions {
* Sets the task the activity will be launched in.
* @hide
*/
@TestApi
@RequiresPermission(START_TASKS_FROM_RECENTS)
@SystemApi
public void setLaunchTaskId(int taskId) {
mLaunchTaskId = taskId;
}
@@ -1529,6 +1531,7 @@ public class ActivityOptions {
/**
* @hide
*/
@SystemApi
public int getLaunchTaskId() {
return mLaunchTaskId;
}