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

Commit 721a5e4a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "TaskOrganizer: Send newest TaskInfo in taskVanished" into rvc-dev am: 2832f868 

Change-Id: Iae55c89724b610e9ad4b6ddcf6899b18a70c0a8c
parents 69c1aa41 2832f868

core/java/android/view/ITaskOrganizer.aidl

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.app.ActivityManager; 
 */

oneway interface ITaskOrganizer {

    void taskAppeared(in ActivityManager.RunningTaskInfo taskInfo);

    void taskVanished(in IWindowContainer container);

    void taskVanished(in ActivityManager.RunningTaskInfo taskInfo);



    /**

     * Called upon completion of

packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java

+2 −1
Original line number Diff line number Diff line
@@ -251,7 +251,8 @@ public class PipTaskOrganizer extends ITaskOrganizer.Stub { 
    }



    @Override

    public void taskVanished(IWindowContainer token) {

    public void taskVanished(ActivityManager.RunningTaskInfo info) {

        IWindowContainer token = info.token;

        Objects.requireNonNull(token, "Requires valid IWindowContainer");

        if (token.asBinder() != mToken.asBinder()) {

            Log.wtf(TAG, "Unrecognized token: " + token);

packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ class SplitScreenTaskOrganizer extends ITaskOrganizer.Stub { 
    }



    @Override

    public void taskVanished(IWindowContainer container) {

    public void taskVanished(RunningTaskInfo taskInfo) {

    }



    @Override

services/core/java/com/android/server/wm/TaskOrganizerController.java

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub 


        void removeTask(Task t) {

            try {

                mOrganizer.taskVanished(t.getRemoteToken());

                mOrganizer.taskVanished(t.getTaskInfo());

            } catch (Exception e) {

                Slog.e(TAG, "Exception sending taskVanished callback" + e);

            }

services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java

+1 −1
Original line number Diff line number Diff line
@@ -1019,7 +1019,7 @@ public class ActivityStarterTests extends ActivityTestsBase { 
        public void taskAppeared(ActivityManager.RunningTaskInfo info) {

        }

        @Override

        public void taskVanished(IWindowContainer wc) {

        public void taskVanished(ActivityManager.RunningTaskInfo info) {

        }

        @Override

        public void transactionReady(int id, SurfaceControl.Transaction t) {