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

Commit bcca774a authored by Jorge Gil's avatar Jorge Gil
Browse files

Use AnimatorTestRule to end animators during tests 

Using runOnUiThread to execute code that starts an Animator allows the
animation to keep running beyond the lifetime of the test. This led to
an eventual crash in WMShellUnitTests when the exit desktop animation
finished and attempted to end() a jank CUJ, who no longer had a worker
thread to work with and caused a NPE.
Instead, run the test in a looper thread and use AnimatorTestRule to
advance time to the end of the animation before the test finishes.

Fix: 374328725
Fix: 375386897
Fix: 375386605
Fix: 375396353
Fix: 375397302
Flag: EXEMPT bugfix
Test: atest WMShellModuleTests - no crashes

Change-Id: I888b467972bf3974960a4d210d7f8a0d1ef4f306
parent 7e1bc07d

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ExitDesktopTaskTransitionHandler.java

+2 −1
Original line number Diff line number Diff line
@@ -60,7 +60,8 @@ import java.util.function.Supplier; 
 * entering and exiting freeform.

 */

public class ExitDesktopTaskTransitionHandler implements Transitions.TransitionHandler {

    private static final int FULLSCREEN_ANIMATION_DURATION = 336;

    @VisibleForTesting

    static final int FULLSCREEN_ANIMATION_DURATION = 336;



    private final Context mContext;

    private final Transitions mTransitions;

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/ExitDesktopTaskTransitionHandlerTest.java

+21 −19
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ package com.android.wm.shell.desktopmode; 


import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;



import static androidx.test.internal.runner.junit4.statement.UiThreadStatement.runOnUiThread;



import static com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_EXIT_DESKTOP_MODE_UNKNOWN;



import static org.junit.Assert.assertTrue;
@@ -28,6 +26,7 @@ import static org.mockito.Mockito.doReturn; 
import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.when;



import android.animation.AnimatorTestRule;

import android.annotation.NonNull;

import android.app.ActivityManager;

import android.app.WindowConfiguration;
@@ -36,6 +35,8 @@ import android.content.res.Resources; 
import android.graphics.Point;

import android.os.Handler;

import android.os.IBinder;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.util.DisplayMetrics;

import android.view.SurfaceControl;

import android.view.WindowManager;
@@ -53,17 +54,23 @@ import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource; 
import com.android.wm.shell.transition.Transitions;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



import java.util.ArrayList;

import java.util.function.Supplier;



/** Tests of {@link com.android.wm.shell.desktopmode.ExitDesktopTaskTransitionHandler} */

@SmallTest

@TestableLooper.RunWithLooper

@RunWith(AndroidTestingRunner.class)

public class ExitDesktopTaskTransitionHandlerTest extends ShellTestCase {



    @Rule

    public final AnimatorTestRule mAnimatorTestRule = new AnimatorTestRule(this);



    @Mock

    private Transitions mTransitions;

    @Mock
@@ -105,7 +112,7 @@ public class ExitDesktopTaskTransitionHandlerTest extends ShellTestCase { 
    }



    @Test

    public void testTransitExitDesktopModeAnimation() throws Throwable {

    public void testTransitExitDesktopModeAnimation() {

        final int transitionType = TRANSIT_EXIT_DESKTOP_MODE_UNKNOWN;

        final int taskId = 1;

        WindowContainerTransaction wct = new WindowContainerTransaction();
@@ -118,21 +125,16 @@ public class ExitDesktopTaskTransitionHandlerTest extends ShellTestCase { 
        TransitionInfo.Change change =

                createChange(WindowManager.TRANSIT_CHANGE, taskId, WINDOWING_MODE_FULLSCREEN);

        TransitionInfo info = createTransitionInfo(TRANSIT_EXIT_DESKTOP_MODE_UNKNOWN, change);

        ArrayList<Exception> exceptions = new ArrayList<>();

        runOnUiThread(() -> {

            try {

                assertTrue(mExitDesktopTaskTransitionHandler



        final boolean animated = mExitDesktopTaskTransitionHandler

                .startAnimation(mToken, info,

                        new SurfaceControl.Transaction(),

                        new SurfaceControl.Transaction(),

                                mTransitionFinishCallback));

            } catch (Exception e) {

                exceptions.add(e);

            }

        });

        if (!exceptions.isEmpty()) {

            throw exceptions.get(0);

        }

                        mTransitionFinishCallback);

        mAnimatorTestRule.advanceTimeBy(

                ExitDesktopTaskTransitionHandler.FULLSCREEN_ANIMATION_DURATION);



        assertTrue(animated);

    }



    private TransitionInfo.Change createChange(@WindowManager.TransitionType int type, int taskId,