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

Commit 5a9a7940 authored by Winson Chung's avatar Winson Chung Committed by android-build-team Robot
Browse files

Remove failsafe runnable once the animation finishes. 

- The scheduled failsafe runnable was running after we had already
  cleaned up the reference to the animation runner. Clear the runnable
  and also mark the animation as canceled so that future calls that
  happen to get through (from the runner as well) are also ignored.

Bug: 79514993
Test: atest FrameworksServicesTests:com.android.server.wm.RecentsAnimationControllerTest
Change-Id: Ib8d565022068833ccad212df3a7f6df68f5343d7
(cherry picked from commit 7906b3e6)
parent a0aa7a91

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);