Merge "Don't preemptively release task leashes w/ transitions" into tm-qpr-dev am: f9257ef0

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;

import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_TASK_ORG;

import static com.android.wm.shell.transition.Transitions.ENABLE_SHELL_TRANSITIONS;

import android.annotation.IntDef;

import android.annotation.NonNull;

            // Notify the recent tasks that a task has been removed

            mRecentTasks.ifPresent(recentTasks -> recentTasks.onTaskRemoved(taskInfo));

            if (appearedInfo.getLeash() != null) {

            if (!ENABLE_SHELL_TRANSITIONS && (appearedInfo.getLeash() != null)) {

                // Preemptively clean up the leash only if shell transitions are not enabled

                appearedInfo.getLeash().release();

            }

        }

import static com.android.wm.shell.ShellTaskOrganizer.TASK_LISTENER_TYPE_FULLSCREEN;

import static com.android.wm.shell.ShellTaskOrganizer.TASK_LISTENER_TYPE_MULTI_WINDOW;

import static com.android.wm.shell.ShellTaskOrganizer.TASK_LISTENER_TYPE_PIP;

import static com.android.wm.shell.transition.Transitions.ENABLE_SHELL_TRANSITIONS;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.fail;

import static org.junit.Assume.assumeFalse;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.clearInvocations;

import static org.mockito.Mockito.mock;

    @Test

    public void testTaskLeashReleasedAfterVanished() throws RemoteException {

        assumeFalse(ENABLE_SHELL_TRANSITIONS);

        RunningTaskInfo taskInfo = createTaskInfo(1, WINDOWING_MODE_MULTI_WINDOW);

        SurfaceControl taskLeash = new SurfaceControl.Builder(new SurfaceSession())

                .setName("task").build();