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

Commit 12af62ac authored by Pragya Bajoria's avatar Pragya Bajoria Committed by Automerger Merge Worker
Browse files

Merge "Crash during Task switch" into main am: 441f3367 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3445099



Change-Id: Ie0897f3ef964f034a6af8a1123237f31dfdcbc48
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 170690ab 441f3367

libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java

+4 −1
Original line number Diff line number Diff line
@@ -529,9 +529,12 @@ public class TaskViewTaskController implements ShellTaskOrganizer.TaskListener { 
            Slog.w(TAG, "Trying to remove a task that was never added? (no taskToken)");

            return;

        }

        // Cache it to avoid NPE and make sure to remove it from recents history.

        // mTaskToken can be cleared in onTaskVanished() when the task is removed.

        final WindowContainerToken taskToken = mTaskToken;

        mShellExecutor.execute(() -> {

            WindowContainerTransaction wct = new WindowContainerTransaction();

            wct.removeTask(mTaskToken);

            wct.removeTask(taskToken);

            mTaskViewTransitions.closeTaskView(wct, this);

        });

    }