commit 1f7f1129e1f494d00b2f80d6ca0b0fc2722a7713
author Jorim Jaggi <jjaggi@google.com> Fri Sep 01 00:05:10 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 01 00:05:10 2017 +0000
tree c4a95d0d37ec11aaedecb9f5be0d65102fed6992
parent 573c453ad1fa547880a17bd6304f3b7321f6f700
parent 449a8560fbb5d516cbf242ec75cd181749d43e55

Merge "Fix stuck activity" into oc-mr1-dev am: ab1760f50f
am: 449a8560fb

Change-Id: If08cfa4718d771d4b4622cc1afed76e1e5424887

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

diff --git a/services/core/java/com/android/server/wm/AppWindowAnimator.java b/services/core/java/com/android/server/wm/AppWindowAnimator.java
index c2edc04..c76b905 100644
--- a/services/core/java/com/android/server/wm/AppWindowAnimator.java
+++ b/services/core/java/com/android/server/wm/AppWindowAnimator.java
@@ -450,7 +450,7 @@
         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);

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

diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java
index d625003..f70035c 100644
--- a/services/core/java/com/android/server/wm/AppWindowToken.java
+++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -362,10 +362,10 @@
 
             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;
                 }
@@ -1618,6 +1618,9 @@
         if (mRemovingFromDisplay) {
             pw.println(prefix + "mRemovingFromDisplay=" + mRemovingFromDisplay);
         }
+        if (mAppAnimator.isAnimating()) {
+            mAppAnimator.dump(pw, prefix + "  ");
+        }
     }
 
     @Override