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

Commit d92cc31c authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Automerger Merge Worker
Browse files

Merge "Update running remote animation state after activity change" into tm-dev am: bad9a217 

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



Change-Id: I05804a3e63448cb75858d87c5f822af80250b196
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a3fb4558 bad9a217

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

+3 −4
Original line number Diff line number Diff line
@@ -304,10 +304,6 @@ class RecentsAnimation implements RecentsAnimationCallbacks, OnRootTaskOrderChan 
                mService.stopAppSwitches();

            }



            if (mCaller != null) {

                mCaller.setRunningRecentsAnimation(false);

            }



            mWindowManager.inSurfaceTransaction(() -> {

                Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER,

                        "RecentsAnimation#onAnimationFinished_inSurfaceTransaction");
@@ -413,6 +409,9 @@ class RecentsAnimation implements RecentsAnimationCallbacks, OnRootTaskOrderChan 
                    if (mWindowManager.mRoot.isLayoutNeeded()) {

                        mWindowManager.mRoot.performSurfacePlacement();

                    }

                    if (mCaller != null) {

                        mCaller.setRunningRecentsAnimation(false);

                    }

                    Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);

                }

            });