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

Commit 664fac3a authored by Ian Chang's avatar Ian Chang Committed by android-build-merger
Browse files

Merge "Tracks app window animation endpoint" into qt-dev am: 51374fc7 

am: 86387b34

Change-Id: I5debb7926fe2726d953d370f430fbea5315265aa
parents 3bdbe764 86387b34

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -2782,6 +2782,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
    protected void onAnimationFinished() {

    protected void onAnimationFinished() {

        super.onAnimationFinished();

        super.onAnimationFinished();





        Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "AWT#onAnimationFinished");

        mTransit = TRANSIT_UNSET;

        mTransit = TRANSIT_UNSET;

        mTransitFlags = 0;

        mTransitFlags = 0;

        mNeedsZBoost = false;

        mNeedsZBoost = false;
@@ -2816,6 +2817,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
        scheduleAnimation();

        scheduleAnimation();





        mActivityRecord.onAnimationFinished();

        mActivityRecord.onAnimationFinished();

        Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);

    }

    }





    @Override

    @Override