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

Commit 5510ecdf authored by Louis Chang's avatar Louis Chang
Browse files

Deprecate MANAGE_ACTIVITY_STACKS permission 

Adding MANAGE_ACTIVITY_TASKS permission as the replacement, but
still grant the deprecated MANAGE_ACTIVITY_STACKS permission for
app compatibility.

Bug: 157876448
Test: presubmit

Change-Id: I894ee66e058b1024a731d3be4b33b69626451f08
parent a2e32910

api/system-current.txt

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

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

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

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

    field @Deprecated public static final String MANAGE_ACTIVITY_STACKS = "android.permission.MANAGE_ACTIVITY_STACKS";

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

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

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

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

api/test-current.txt

+26 −25
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ package android { 
    field public static final String CONFIGURE_DISPLAY_BRIGHTNESS = "android.permission.CONFIGURE_DISPLAY_BRIGHTNESS";

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

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

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

    field @Deprecated public static final String MANAGE_ACTIVITY_STACKS = "android.permission.MANAGE_ACTIVITY_STACKS";

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

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

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

    field public static final String MANAGE_ROLLBACKS = "android.permission.MANAGE_ROLLBACKS";
@@ -128,19 +129,19 @@ package android.app { 
  }



  public class ActivityTaskManager {

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void clearLaunchParamsForPackages(java.util.List<java.lang.String>);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void clearLaunchParamsForPackages(java.util.List<java.lang.String>);

    method public static boolean currentUiModeSupportsErrorDialogs(@NonNull android.content.Context);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void moveTaskToRootTask(int, int, boolean);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public boolean moveTopActivityToPinnedRootTask(int, @NonNull android.graphics.Rect);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void removeRootTasksInWindowingModes(@NonNull int[]);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void removeRootTasksWithActivityTypes(@NonNull int[]);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void requestPictureInPictureMode(@NonNull android.os.IBinder);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void resizePrimarySplitScreen(@NonNull android.graphics.Rect, @NonNull android.graphics.Rect);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void resizeTask(int, android.graphics.Rect);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public boolean setTaskWindowingMode(int, int, boolean) throws java.lang.SecurityException;

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public boolean setTaskWindowingModeSplitScreenPrimary(int, int, boolean, boolean, android.graphics.Rect, boolean) throws java.lang.SecurityException;

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void startSystemLockTaskMode(int);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void stopSystemLockTaskMode();

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void moveTaskToRootTask(int, int, boolean);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public boolean moveTopActivityToPinnedRootTask(int, @NonNull android.graphics.Rect);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void removeRootTasksInWindowingModes(@NonNull int[]);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void removeRootTasksWithActivityTypes(@NonNull int[]);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void requestPictureInPictureMode(@NonNull android.os.IBinder);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void resizePrimarySplitScreen(@NonNull android.graphics.Rect, @NonNull android.graphics.Rect);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void resizeTask(int, android.graphics.Rect);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public boolean setTaskWindowingMode(int, int, boolean) throws java.lang.SecurityException;

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public boolean setTaskWindowingModeSplitScreenPrimary(int, int, boolean, boolean, android.graphics.Rect, boolean) throws java.lang.SecurityException;

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void startSystemLockTaskMode(int);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void stopSystemLockTaskMode();

    method public static boolean supportsMultiWindow(android.content.Context);

    method public static boolean supportsSplitScreenMultiWindow(android.content.Context);

    field public static final int DEFAULT_MINIMAL_SPLIT_SCREEN_DISPLAY_SIZE_DP = 440; // 0x1b8
@@ -2353,7 +2354,7 @@ package android.window { 
    ctor public DisplayAreaOrganizer();

    method public void onDisplayAreaAppeared(@NonNull android.window.DisplayAreaInfo, @NonNull android.view.SurfaceControl);

    method public void onDisplayAreaVanished(@NonNull android.window.DisplayAreaInfo);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void registerOrganizer(int);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void registerOrganizer(int);

    field public static final int FEATURE_DEFAULT_TASK_CONTAINER = 1; // 0x1

    field public static final int FEATURE_ONE_HANDED = 3; // 0x3

    field public static final int FEATURE_ROOT = 0; // 0x0
@@ -2376,19 +2377,19 @@ package android.window { 


  public class TaskOrganizer extends android.window.WindowOrganizer {

    ctor public TaskOrganizer();

    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void createRootTask(int, int, @Nullable android.os.IBinder);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public boolean deleteRootTask(@NonNull android.window.WindowContainerToken);

    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public java.util.List<android.app.ActivityManager.RunningTaskInfo> getChildTasks(@NonNull android.window.WindowContainerToken, @NonNull int[]);

    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public android.window.WindowContainerToken getImeTarget(int);

    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public java.util.List<android.app.ActivityManager.RunningTaskInfo> getRootTasks(int, @NonNull int[]);

    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void createRootTask(int, int, @Nullable android.os.IBinder);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public boolean deleteRootTask(@NonNull android.window.WindowContainerToken);

    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public java.util.List<android.app.ActivityManager.RunningTaskInfo> getChildTasks(@NonNull android.window.WindowContainerToken, @NonNull int[]);

    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public android.window.WindowContainerToken getImeTarget(int);

    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public java.util.List<android.app.ActivityManager.RunningTaskInfo> getRootTasks(int, @NonNull int[]);

    method @BinderThread public void onBackPressedOnTaskRoot(@NonNull android.app.ActivityManager.RunningTaskInfo);

    method @BinderThread public void onTaskAppeared(@NonNull android.app.ActivityManager.RunningTaskInfo, @NonNull android.view.SurfaceControl);

    method @BinderThread public void onTaskInfoChanged(@NonNull android.app.ActivityManager.RunningTaskInfo);

    method @BinderThread public void onTaskVanished(@NonNull android.app.ActivityManager.RunningTaskInfo);

    method @CallSuper @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public java.util.List<android.window.TaskAppearedInfo> registerOrganizer();

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void setInterceptBackPressedOnTaskRoot(@NonNull android.window.WindowContainerToken, boolean);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void setLaunchRoot(int, @NonNull android.window.WindowContainerToken);

    method @CallSuper @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void unregisterOrganizer();

    method @CallSuper @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public java.util.List<android.window.TaskAppearedInfo> registerOrganizer();

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void setInterceptBackPressedOnTaskRoot(@NonNull android.window.WindowContainerToken, boolean);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void setLaunchRoot(int, @NonNull android.window.WindowContainerToken);

    method @CallSuper @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void unregisterOrganizer();

  }



  public final class WindowContainerToken implements android.os.Parcelable {
@@ -2423,8 +2424,8 @@ package android.window { 


  public class WindowOrganizer {

    ctor public WindowOrganizer();

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public int applySyncTransaction(@NonNull android.window.WindowContainerTransaction, @NonNull android.window.WindowContainerTransactionCallback);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void applyTransaction(@NonNull android.window.WindowContainerTransaction);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public int applySyncTransaction(@NonNull android.window.WindowContainerTransaction, @NonNull android.window.WindowContainerTransactionCallback);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void applyTransaction(@NonNull android.window.WindowContainerTransaction);

  }



}

core/java/android/app/ActivityTaskManager.java

+12 −12
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ public class ActivityTaskManager { 
     * @param toTop If the task should be moved to the top once the windowing mode changes.

     * @return Whether the task was successfully put into the specified windowing mode.

     */

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)

    public boolean setTaskWindowingMode(int taskId, int windowingMode, boolean toTop)

            throws SecurityException {

        try {
@@ -200,7 +200,7 @@ public class ActivityTaskManager { 
     *                    going into split-screen mode.

     * @return Whether the task was successfully put into splitscreen.

     */

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)

    public boolean setTaskWindowingModeSplitScreenPrimary(int taskId, int createMode, boolean toTop,

            boolean animate, Rect initialBounds, boolean showRecents) throws SecurityException {

        try {
@@ -214,7 +214,7 @@ public class ActivityTaskManager { 
     * Removes root tasks in the windowing modes from the system if they are of activity type

     * ACTIVITY_TYPE_STANDARD or ACTIVITY_TYPE_UNDEFINED

     */

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)

    public void removeRootTasksInWindowingModes(@NonNull int[] windowingModes) {

        try {

            getService().removeRootTasksInWindowingModes(windowingModes);
@@ -224,7 +224,7 @@ public class ActivityTaskManager { 
    }



    /** Removes root tasks of the activity types from the system. */

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)

    public void removeRootTasksWithActivityTypes(@NonNull int[] activityTypes) {

        try {

            getService().removeRootTasksWithActivityTypes(activityTypes);
@@ -315,7 +315,7 @@ public class ActivityTaskManager { 
     * @param bounds Bounds to use for pinned root task.

     * @return True if the top activity of root task was successfully moved to the pinned root task.

     */

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)

    public boolean moveTopActivityToPinnedRootTask(int rootTaskId, @NonNull Rect bounds) {

        try {

            return getService().moveTopActivityToPinnedRootTask(rootTaskId, bounds);
@@ -328,7 +328,7 @@ public class ActivityTaskManager { 
     * Start to enter lock task mode for given task by system(UI).

     * @param taskId Id of task to lock.

     */

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)

    public void startSystemLockTaskMode(int taskId) {

        try {

            getService().startSystemLockTaskMode(taskId);
@@ -340,7 +340,7 @@ public class ActivityTaskManager { 
    /**

     * Stop lock task mode by system(UI).

     */

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)

    public void stopSystemLockTaskMode() {

        try {

            getService().stopSystemLockTaskMode();
@@ -355,7 +355,7 @@ public class ActivityTaskManager { 
     * @param rootTaskId Id of the rootTask for task moving.

     * @param toTop Whether the given task should shown to top of stack.

     */

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)

    public void moveTaskToRootTask(int taskId, int rootTaskId, boolean toTop) {

        try {

            getService().moveTaskToRootTask(taskId, rootTaskId, toTop);
@@ -369,7 +369,7 @@ public class ActivityTaskManager { 
     * @param taskId Id of task to resize.

     * @param bounds Bounds to resize task.

     */

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)

    public void resizeTask(int taskId, Rect bounds) {

        try {

            getService().resizeTask(taskId, bounds, RESIZE_MODE_SYSTEM);
@@ -383,7 +383,7 @@ public class ActivityTaskManager { 
     * @param rootTaskBounds Bounds to resize stack.

     * @param taskBounds Bounds to resize task.

     */

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)

    public void resizePrimarySplitScreen(@NonNull Rect rootTaskBounds, @NonNull Rect taskBounds) {

        try {

            getService().resizePrimarySplitScreen(rootTaskBounds, taskBounds, null, null, null);
@@ -396,7 +396,7 @@ public class ActivityTaskManager { 
     * Clears launch params for the given package.

     * @param packageNames the names of the packages of which the launch params are to be cleared

     */

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)

    public void clearLaunchParamsForPackages(List<String> packageNames) {

        try {

            getService().clearLaunchParamsForPackages(packageNames);
@@ -410,7 +410,7 @@ public class ActivityTaskManager { 
     * @hide

     */

    @TestApi

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)

    public void requestPictureInPictureMode(@NonNull IBinder token) {

        try {

            getService().requestPictureInPictureMode(token);

core/java/android/view/WindowManager.java

+1 −1
Original line number Diff line number Diff line
@@ -2154,7 +2154,7 @@ public interface WindowManager extends ViewManager { 
         * {@link DragEvent#ACTION_DROP}) will be relinquished to the window.

         * @hide

         */

        @RequiresPermission(permission.MANAGE_ACTIVITY_STACKS)

        @RequiresPermission(permission.MANAGE_ACTIVITY_TASKS)

        public static final int PRIVATE_FLAG_INTERCEPT_GLOBAL_DRAG_AND_DROP = 0x80000000;



        /**

core/java/android/window/DisplayAreaOrganizer.java

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ public class DisplayAreaOrganizer extends WindowOrganizer { 
     */

    public static final int FEATURE_VENDOR_FIRST = FEATURE_SYSTEM_LAST + 1;



    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)

    public void registerOrganizer(int displayAreaFeature) {

        try {

            getController().registerOrganizer(mInterface, displayAreaFeature);
@@ -96,7 +96,7 @@ public class DisplayAreaOrganizer extends WindowOrganizer { 
    /**

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)

    public void unregisterOrganizer() {

        try {

            getController().unregisterOrganizer(mInterface);