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

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

Change-Id: I04071d026e0f6095bac3c312b99f4942ef5f7208
This commit is contained in:
Evan Rosky
2021-09-01 01:47:58 +00:00
committed by Automerger Merge Worker
parent b2fc9a7e27 ed7cdd6d6e
commit c493d07941
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

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