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

Merge "Add more logs in WindowManagerService#waitForAnimationsToComplete" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-18 15:23:48 +00:00
committed by Android (Google) Code Review
parent 5ce0c35e11 8c7067cca4
commit dacdc6a7f7
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/SurfaceAnimator.java
View File

@@ -520,7 +520,7 @@ class SurfaceAnimator {
/**
* Converts {@link AnimationType} to String.
*/
private static String animationTypeToString(@AnimationType int type) {
static String animationTypeToString(@AnimationType int type) {
switch (type) {
case ANIMATION_TYPE_NONE: return "none";
case ANIMATION_TYPE_APP_TRANSITION: return "app_transition";

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

@@ -106,6 +106,7 @@ import static com.android.server.wm.ActivityTaskManagerService.POWER_MODE_REASON
import static com.android.server.wm.DisplayContent.IME_TARGET_CONTROL;
import static com.android.server.wm.DisplayContent.IME_TARGET_INPUT;
import static com.android.server.wm.DisplayContent.IME_TARGET_LAYERING;
import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_ALL;
import static com.android.server.wm.WindowContainer.AnimationFlags.CHILDREN;
import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS;
import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;
@@ -8090,8 +8091,13 @@ public class WindowManagerService extends IWindowManager.Stub
// This could prevent if there is no container animation, we still have to apply the
// pending transaction and exit waiting.
mAnimator.mNotifyWhenNoAnimation = true;
while ((mAnimator.isAnimationScheduled()
|| mRoot.isAnimating(TRANSITION | CHILDREN)) && timeoutRemaining > 0) {
WindowContainer animatingContainer = null;
while (mAnimator.isAnimationScheduled() || timeoutRemaining > 0) {
animatingContainer = mRoot.getAnimatingContainer(TRANSITION | CHILDREN,
ANIMATION_TYPE_ALL);
if (animatingContainer == null) {
break;
}
long startTime = System.currentTimeMillis();
try {
mGlobalLock.wait(timeoutRemaining);
@@ -8101,9 +8107,13 @@ public class WindowManagerService extends IWindowManager.Stub
}
mAnimator.mNotifyWhenNoAnimation = false;
if (mAnimator.isAnimationScheduled()
|| mRoot.isAnimating(TRANSITION | CHILDREN)) {
Slog.w(TAG, "Timed out waiting for animations to complete.");
if (mAnimator.isAnimationScheduled() || animatingContainer != null) {
Slog.w(TAG, "Timed out waiting for animations to complete,"
+ " animatingContainer=" + animatingContainer
+ " animationType=" + SurfaceAnimator.animationTypeToString(
animatingContainer != null
? animatingContainer.mSurfaceAnimator.getAnimationType()
: SurfaceAnimator.ANIMATION_TYPE_NONE));
}
}
}