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

Commit feacb759 authored by Tom Natan's avatar Tom Natan Committed by Automerger Merge Worker
Browse files

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

Merge "Make ActivityOptions#setLaunchTaskId a system API" into sc-v2-dev am: fdf0378b am: 8ea64535

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16093509

Change-Id: I2a76d0ee05bc162bb171831aaf4691482756388d
parents 2b75dcc3 8ea64535

core/api/system-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -440,6 +440,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);

























core/api/test-current.txt



+0
−1




























Original line number
Diff line number
Diff line








@@ -146,7 +146,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);

































core/java/android/app/ActivityOptions.java



+3
−1




























Original line number
Diff line number
Diff line








@@ -1529,7 +1529,8 @@ public class ActivityOptions extends ComponentOptions {













     * Sets the task the activity will be launched in.















     * @hide















     */













    @TestApi













    @RequiresPermission(START_TASKS_FROM_RECENTS)













    @SystemApi















    public void setLaunchTaskId(int taskId) {















        mLaunchTaskId = taskId;















    }









@@ -1537,6 +1538,7 @@ public class ActivityOptions extends ComponentOptions {













    /**















     * @hide















     */













    @SystemApi















    public int getLaunchTaskId() {















        return mLaunchTaskId;















    }