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

Commit 59abf29b 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: Ib0e99450b5f2f5c30c4d9ae2e810547e0821e222
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ec2638b8 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);

                }

            });