Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ib9037eaceec6f82d5a593aec08cbe94cf7a16a8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jorim Jaggi
2022-04-04 13:54:53 +00:00
committed by Automerger Merge Worker
parent 89d8ea8477 59abf29bd3
commit 469672db33
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/RecentsAnimation.java
View File

@@ -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);
}
});