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

Merge "Fix stuck activity" into oc-mr1-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2017-08-31 23:17:06 +00:00
committed by Android (Google) Code Review
parent 9543ce8ffe 4d1835db5d
commit ab1760f50f
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -450,7 +450,7 @@ public class AppWindowAnimator {
return isAnimating;
}
void dump(PrintWriter pw, String prefix, boolean dumpAll) {
void dump(PrintWriter pw, String prefix) {
pw.print(prefix); pw.print("mAppToken="); pw.println(mAppToken);
pw.print(prefix); pw.print("mAnimator="); pw.println(mAnimator);
pw.print(prefix); pw.print("freezingScreen="); pw.print(freezingScreen);

9
services/core/java/com/android/server/wm/AppWindowToken.java
View File

@@ -368,10 +368,10 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
boolean runningAppAnimation = false;
if (mAppAnimator.animation == AppWindowAnimator.sDummyAnimation) {
mAppAnimator.setNullAnimation();
}
if (transit != AppTransition.TRANSIT_UNSET) {
if (mAppAnimator.animation == AppWindowAnimator.sDummyAnimation) {
mAppAnimator.setNullAnimation();
}
if (mService.applyAnimationLocked(this, lp, transit, visible, isVoiceInteraction)) {
delayed = runningAppAnimation = true;
}
@@ -1759,6 +1759,9 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
if (mRemovingFromDisplay) {
pw.println(prefix + "mRemovingFromDisplay=" + mRemovingFromDisplay);
}
if (mAppAnimator.isAnimating()) {
mAppAnimator.dump(pw, prefix + " ");
}
}
@Override