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

Commit 5d0c2f41 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Continue deferring removal of activities in a transition" into... 

Merge "Continue deferring removal of activities in a transition" into tm-qpr-dev am: bab5ec4a am: 71ea608a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19394339



Change-Id: Ib26c3dba285b5c12fdcbdb4be11e10ab19799739
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d1478f71 71ea608a

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

+0 −5
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITIO 
import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_RECENTS;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_STARTING_REVEAL;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_WINDOW_ANIMATION;

import static com.android.server.wm.WindowContainer.AnimationFlags.CHILDREN;

import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS;

import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;

import static com.android.server.wm.WindowContainerChildProto.WINDOW;
@@ -4957,10 +4956,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
                || isAnimating(0 /* flags */, ANIMATION_TYPE_WINDOW_ANIMATION);

    }



    boolean isExitAnimationRunningSelfOrChild() {

        return isAnimating(CHILDREN, ANIMATION_TYPE_WINDOW_ANIMATION);

    }



    private boolean shouldFinishAnimatingExit() {

        // Exit animation might be applied soon.

        if (inTransition()) {