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

Commit 25515b8a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove moveTopActivityToPinnedRootTask completely"

parents d3fe342f 3ece8f8c

core/api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ package android.app { 
    method public static boolean currentUiModeSupportsErrorDialogs(@NonNull android.content.Context);

    method public static int getMaxNumPictureInPictureActions(@NonNull android.content.Context);

    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 resizePrimarySplitScreen(@NonNull android.graphics.Rect, @NonNull android.graphics.Rect);

core/java/android/app/ActivityTaskManager.java

+0 −15
Original line number Diff line number Diff line
@@ -294,21 +294,6 @@ public class ActivityTaskManager { 
                com.android.internal.R.bool.config_supportsSplitScreenMultiWindow);

    }



    /**

     * Moves the top activity in the input rootTaskId to the pinned root task.

     * @param rootTaskId Id of root task to move the top activity to pinned root task.

     * @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_TASKS)

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

        try {

            return getService().moveTopActivityToPinnedRootTask(rootTaskId, bounds);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Start to enter lock task mode for given task by system(UI).

     * @param taskId Id of task to lock.

core/java/android/app/IActivityManager.aidl

+0 −1
Original line number Diff line number Diff line
@@ -508,7 +508,6 @@ interface IActivityManager { 
    boolean stopBinderTrackingAndDump(in ParcelFileDescriptor fd);

    @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)

    void suppressResizeConfigChanges(boolean suppress);

    boolean moveTopActivityToPinnedRootTask(int rootTaskId, in Rect bounds);

    boolean isAppStartModeDisabled(int uid, in String packageName);

    @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)

    boolean unlockUser(int userid, in byte[] token, in byte[] secret,

core/java/android/app/IActivityTaskManager.aidl

+0 −1
Original line number Diff line number Diff line
@@ -257,7 +257,6 @@ interface IActivityTaskManager { 
    void keyguardGoingAway(int flags);



    void suppressResizeConfigChanges(boolean suppress);

    boolean moveTopActivityToPinnedRootTask(int rootTaskId, in Rect bounds);



    /**

     * Resizes the docked stack, and all other stacks as the result of the dock stack bounds change.

services/core/java/com/android/server/am/ActivityManagerService.java

+0 −14
Original line number Diff line number Diff line
@@ -5729,20 +5729,6 @@ public class ActivityManagerService extends IActivityManager.Stub 
        return mActivityTaskManager.getRecentTasks(maxNum, flags, userId);

    }













    /**













     * Moves the top activity in the input rootTaskId to the pinned root task.













     *













     * @param rootTaskId Id of root task to move the top activity to pinned root task.













     * @param bounds Bounds to use for pinned root task.













     *













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













     *          root task.













     */













    @Override













    public boolean moveTopActivityToPinnedRootTask(int rootTaskId, Rect bounds) {













        return mActivityTaskManager.moveTopActivityToPinnedRootTask(rootTaskId, bounds);













    }



























    @Override















    public List<RootTaskInfo> getAllRootTaskInfos() {















        return mActivityTaskManager.getAllRootTaskInfos();