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

Commit e11ad964 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Wale Ogunwale
Browse files

Revert "Have createRootTask return TaskAppearInfo" 

Revert "ARC++ changes to mirror changes to createRootTask"

Revert submission 12855635-create-root-task

Reason for revert: b/171369770
Reverted Changes:
Iabf090caa:ARC++ changes to mirror changes to createRootTask
I5948e6234:Have createRootTask return TaskAppearInfo
Fixes: 171369770
Bug: 169266958

Change-Id: Iee1cf0b30e368987931f928de8c691640e18286a
parent 3609d63a

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -2372,7 +2372,7 @@ package android.window { 


  public class TaskOrganizer extends android.window.WindowOrganizer {

    ctor public TaskOrganizer();

    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public android.window.TaskAppearedInfo createRootTask(int, int);

    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public android.app.ActivityManager.RunningTaskInfo createRootTask(int, int);

    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);

core/java/android/window/ITaskOrganizerController.aidl

+2 −6
Original line number Diff line number Diff line
@@ -39,12 +39,8 @@ interface ITaskOrganizerController { 
     */

    void unregisterTaskOrganizer(ITaskOrganizer organizer);



    /**

     * Creates a persistent root task in WM for a particular windowing-mode.

     * {@link TaskOrganizer#onTaskAppeared} won't be called since we are returning

     * {@link TaskAppearedInfo} here.

     */

    TaskAppearedInfo createRootTask(int displayId, int windowingMode);

    /** Creates a persistent root task in WM for a particular windowing-mode. */

    ActivityManager.RunningTaskInfo createRootTask(int displayId, int windowingMode);



    /** Deletes a persistent root task in WM */

    boolean deleteRootTask(in WindowContainerToken task);

core/java/android/window/TaskOrganizer.java

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ public class TaskOrganizer extends WindowOrganizer { 
    /** Creates a persistent root task in WM for a particular windowing-mode. */

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)

    @Nullable

    public TaskAppearedInfo createRootTask(int displayId, int windowingMode) {

    public ActivityManager.RunningTaskInfo createRootTask(int displayId, int windowingMode) {

        try {

            return mTaskOrganizerController.createRootTask(displayId, windowingMode);

        } catch (RemoteException e) {

libs/WindowManager/Shell/res/raw/wm_shell_protolog.json

+0 −6
Original line number Diff line number Diff line
@@ -31,12 +31,6 @@ 
      "group": "WM_SHELL_TASK_ORG",

      "at": "com\/android\/wm\/shell\/ShellTaskOrganizer.java"

    },

    "-1312360667": {

      "message": "createRootTask() displayId=%d winMode=%d listener=%s",

      "level": "VERBOSE",

      "group": "WM_SHELL_TASK_ORG",

      "at": "com\/android\/wm\/shell\/ShellTaskOrganizer.java"

    },

    "-880817403": {

      "message": "Task vanished taskId=%d",

      "level": "VERBOSE",

libs/WindowManager/Shell/src/com/android/wm/shell/ShellTaskOrganizer.java

+0 −14
Original line number Diff line number Diff line
@@ -137,20 +137,6 @@ public class ShellTaskOrganizer extends TaskOrganizer { 
        }

    }



    public TaskAppearedInfo createRootTask(

            int displayId, int windowingMode, TaskListener listener) {

        synchronized (mLock) {

            ProtoLog.v(WM_SHELL_TASK_ORG, "createRootTask() displayId=%d winMode=%d listener=%s",

                    displayId, windowingMode, listener.toString());

            final TaskAppearedInfo info = super.createRootTask(displayId, windowingMode);



            // Add the listener and send the task appeared signal

            mTaskListeners.put(info.getTaskInfo().taskId, listener);

            onTaskAppeared(info);

            return info;

        }

    }



    /**

     * Adds a listener for a specific task id.

     */