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

Merge "Don't explicitly wait for starting-window during tests with shell-transitions" into sc-v2-dev am: ed7cdd6d6e am: c493d07941

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

Change-Id: Id7b64bf8ae9b2a18b3fcb10e367e47c293bf19df
This commit is contained in:
Evan Rosky
2021-09-01 01:59:22 +00:00
committed by Automerger Merge Worker
parent 4a9d5765d0 c493d07941
commit 1e0897e2a3
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -8113,9 +8113,8 @@ public class WindowManagerService extends IWindowManager.Stub
boolean animateStarting = false;
while (timeoutRemaining > 0) {
// Waiting until all starting windows has finished animating.
animateStarting = mRoot.forAllActivities(a -> {
return a.hasStartingWindow();
});
animateStarting = !mAtmService.getTransitionController().isShellTransitionsEnabled()
&& mRoot.forAllActivities(ActivityRecord::hasStartingWindow);
boolean isAnimating = mAnimator.isAnimationScheduled()
|| mRoot.isAnimating(TRANSITION | CHILDREN, ANIMATION_TYPE_ALL)
|| animateStarting;