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

Commit 5e98f03d authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [4042485, 4043619, 4043655, 4042338] into pi-release 

Change-Id: I914c70013a379b09c76246c4f753e1fe3f2c5007
parents a0aa7a91 5a9a7940

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

+4 −0
Original line number Diff line number Diff line
@@ -426,9 +426,13 @@ public class RecentsAnimationController implements DeathRecipient { 
            removeAnimation(taskAdapter);

        }



        // Clear any pending failsafe runnables

        mService.mH.removeCallbacks(mFailsafeRunnable);



        // Clear references to the runner

        unlinkToDeathOfRunner();

        mRunner = null;

        mCanceled = true;



        // Clear associated input consumers

        mService.mInputMonitor.updateInputWindowsLw(true /*force*/);

services/tests/servicestests/src/com/android/server/wm/RecentsAnimationControllerTest.java

+22 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ package com.android.server.wm; 
import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.view.Display.DEFAULT_DISPLAY;

import static com.android.server.wm.RecentsAnimationController.REORDER_KEEP_IN_PLACE;

import static com.android.server.wm.RecentsAnimationController.REORDER_MOVE_TO_ORIGINAL_POSITION;

import static org.junit.Assert.fail;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.atLeast;

import static org.mockito.Mockito.verify;
@@ -82,6 +85,25 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { 
        verifyNoMoreInteractionsExceptAsBinder(mMockRunner);

    }



    @Test

    public void testCancelAfterRemove_expectIgnored() throws Exception {

        final AppWindowToken appWindow = createAppWindowToken(mDisplayContent,

                WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);

        AnimationAdapter adapter = mController.addAnimation(appWindow.getTask(),

                false /* isRecentTaskInvisible */);

        adapter.startAnimation(mMockLeash, mMockTransaction, mFinishedCallback);



        // Remove the app window so that the animation target can not be created

        appWindow.removeImmediately();

        mController.startAnimation();

        mController.cleanupAnimation(REORDER_KEEP_IN_PLACE);

        try {

            mController.cancelAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION, "test");

        } catch (Exception e) {

            fail("Unexpected failure when canceling animation after finishing it");

        }

    }



    private static void verifyNoMoreInteractionsExceptAsBinder(IInterface binder) {

        verify(binder, atLeast(0)).asBinder();

        verifyNoMoreInteractions(binder);