Merge "Fix stuck activity" into oc-mr1-dev am: ab1760f50f (1f7f1129) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/AppWindowAnimator.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

+6 −3

Original line number	Diff line number	Diff line
		@@ -362,10 +362,10 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree

		boolean runningAppAnimation = false;

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

		@Override