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

Commit fc8fc160 authored by Nate Myren's avatar Nate Myren Committed by Android (Google) Code Review
Browse files

Merge "Add START_TASKS_FROM_RECENTS to @SystemApi"

parents f3654260 64faa402

core/api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ package android { 
    field public static final String START_ACTIVITIES_FROM_BACKGROUND = "android.permission.START_ACTIVITIES_FROM_BACKGROUND";

    field public static final String START_CROSS_PROFILE_ACTIVITIES = "android.permission.START_CROSS_PROFILE_ACTIVITIES";

    field public static final String START_REVIEW_PERMISSION_DECISIONS = "android.permission.START_REVIEW_PERMISSION_DECISIONS";

    field public static final String START_TASKS_FROM_RECENTS = "android.permission.START_TASKS_FROM_RECENTS";

    field public static final String STATUS_BAR_SERVICE = "android.permission.STATUS_BAR_SERVICE";

    field public static final String STOP_APP_SWITCHES = "android.permission.STOP_APP_SWITCHES";

    field public static final String SUBSTITUTE_NOTIFICATION_APP_NAME = "android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME";
@@ -507,7 +508,7 @@ package android.app { 














  public class ActivityOptions {















    method public int getLaunchTaskId();













    method @RequiresPermission("android.permission.START_TASKS_FROM_RECENTS") public void setLaunchTaskId(int);













    method @RequiresPermission(android.Manifest.permission.START_TASKS_FROM_RECENTS) public void setLaunchTaskId(int);















  }





























  public class AlarmManager {

























core/api/test-current.txt



+0
−1




























Original line number
Diff line number
Diff line








@@ -42,7 +42,6 @@ package android {













    field public static final String SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS = "android.permission.SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS";















    field public static final String SET_GAME_SERVICE = "android.permission.SET_GAME_SERVICE";















    field public static final String SET_KEYBOARD_LAYOUT = "android.permission.SET_KEYBOARD_LAYOUT";













    field public static final String START_TASKS_FROM_RECENTS = "android.permission.START_TASKS_FROM_RECENTS";















    field public static final String SUSPEND_APPS = "android.permission.SUSPEND_APPS";















    field public static final String TEST_BIOMETRIC = "android.permission.TEST_BIOMETRIC";















    field public static final String TEST_MANAGE_ROLLBACKS = "android.permission.TEST_MANAGE_ROLLBACKS";

































core/res/AndroidManifest.xml



+1
−1




























Original line number
Diff line number
Diff line








@@ -2975,7 +2975,7 @@













    <permission android:name="android.permission.REAL_GET_TASKS"















        android:protectionLevel="signature|privileged" />





























    <!-- @TestApi Allows an application to start a task from a ActivityManager#RecentTaskInfo.













    <!-- @SystemApi Allows an application to start a task from a ActivityManager#RecentTaskInfo.















         @hide -->















    <permission android:name="android.permission.START_TASKS_FROM_RECENTS"















        android:protectionLevel="signature|privileged|recents" />