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

Commit ab9fcb21 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Fix stuck exiting windows 

When a window was marked as exiting because in WS.removeIfPossible
applyAnimationLocked returned true just because AWT was in
mClosing/OpeningApps for the transition, the window wasn't removed
if there was no animation running for the app transition.

Fix this by also calling the animation finished callback when not
running an animation, because other code parts rely on that being
called.

Test: Change language, swipe up, make sure no stuck window
Test: AppWindowTokenTests
Change-Id: I9cfd0c4090a258bc90ba5cf7d71795b6fce7f8ef
Fixes: 72811863
parent c8cc2292

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

+6 −0
Original line number Diff line number Diff line
@@ -450,6 +450,12 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 


        if (isReallyAnimating()) {

            delayed = true;

        } else {



            // We aren't animating anything, but exiting windows rely on the animation finished

            // callback being called in case the AppWindowToken was pretending to be animating,

            // which we might have done because we were in closing/opening apps list.

            onAnimationFinished();

        }



        for (int i = mChildren.size() - 1; i >= 0 && !delayed; i--) {

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

+20 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import org.junit.Test; 
import org.junit.runner.RunWith;



import android.platform.test.annotations.Presubmit;

import android.support.test.filters.FlakyTest;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;

import android.view.Surface;
@@ -29,12 +30,14 @@ import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_BEHIND; 
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET;

import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW;

import static android.view.WindowManager.LayoutParams.FIRST_SUB_WINDOW;

import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;

import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING;

import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION;

import static android.view.WindowManager.TRANSIT_UNSET;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNull;
@@ -43,7 +46,7 @@ import static org.junit.Assert.assertTrue; 
 * Tests for the {@link AppWindowToken} class.

 *

 * Build/Install/Run:

 *  bit FrameworksServicesTests:com.android.server.wm.AppWindowTokenTests

 *  atest FrameworksServicesTests:com.android.server.wm.AppWindowTokenTests

 */

@SmallTest

// TODO: b/68267650
@@ -231,4 +234,20 @@ public class AppWindowTokenTests extends WindowTestsBase { 
        mToken.finishRelaunching();

        assertFalse(mToken.containsShowWhenLockedWindow() || mToken.containsDismissKeyguardWindow());

    }



    @Test

    @FlakyTest(detail = "Promote once confirmed non-flaky")

    public void testStuckExitingWindow() throws Exception {

        final WindowState closingWindow = createWindow(null, FIRST_APPLICATION_WINDOW,

                "closingWindow");

        closingWindow.mAnimatingExit = true;

        closingWindow.mRemoveOnExit = true;

        closingWindow.mAppToken.setVisibility(null, false /* visible */, TRANSIT_UNSET,

                true /* performLayout */, false /* isVoiceInteraction */);



        // We pretended that we were running an exit animation, but that should have been cleared up

        // by changing visibility of AppWindowToken

        closingWindow.removeIfPossible();

        assertTrue(closingWindow.mRemoved);

    }

}

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

+1 −1

File changed.

Contains only whitespace changes.