commit 86387b3487859c2f11e974a46b1d037e0b585fae
author Ian Chang <ianchang@google.com> Thu May 16 17:53:38 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 16 17:53:38 2019 -0700
tree 24cf89c05813f79109588e6a10c1eb7fa3668ef9
parent cbd8258a138fd62a064c2c396d37532d9fdfa43b
parent 51374fc706c8d83f481a498bb582dea4be388058

Merge "Tracks app window animation endpoint" into qt-dev
am: 51374fc706

Change-Id: I2ef3d7c0a13348ebd2694d10c284286d12ac0ca4

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 ecbecba..3d7e50d 100644
--- a/services/core/java/com/android/server/wm/AppWindowToken.java
+++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -2782,6 +2782,7 @@
     protected void onAnimationFinished() {
         super.onAnimationFinished();
 
+        Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "AWT#onAnimationFinished");
         mTransit = TRANSIT_UNSET;
         mTransitFlags = 0;
         mNeedsZBoost = false;
@@ -2816,6 +2817,7 @@
         scheduleAnimation();
 
         mActivityRecord.onAnimationFinished();
+        Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
     }
 
     @Override