Perform finish animation actions.
When stepAnimation returns false, do not return false immediately.
Instead carry out finish actions. Also, remove state machine that is no
longer necessary.
Fixes bug 6184070.
Change-Id: I530eb2b62b864bbce929f573d10b31b102152f1f
diff --git a/services/java/com/android/server/wm/AppWindowToken.java b/services/java/com/android/server/wm/AppWindowToken.java
index 5ca09e7..67b667a 100644
--- a/services/java/com/android/server/wm/AppWindowToken.java
+++ b/services/java/com/android/server/wm/AppWindowToken.java
@@ -240,8 +240,10 @@
animation.setStartTime(currentTime);
animating = true;
}
- // we're done!
- return stepAnimation(currentTime);
+ if (stepAnimation(currentTime)) {
+ // we're done!
+ return true;
+ }
}
} else if (animation != null) {
// If the display is frozen, and there is a pending animation,