summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Chang <ianchang@google.com>2019-05-16 23:59:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-16 23:59:25 +0000
commit51374fc706c8d83f481a498bb582dea4be388058 (patch)
tree24cf89c05813f79109588e6a10c1eb7fa3668ef9
parent24d193cc301621ce9866a39effcb74621e2fef67 (diff)
parent8b2822efdd1a3e8fbf64340c10925c06e6388f6c (diff)
downloadframeworks_base-51374fc706c8d83f481a498bb582dea4be388058.tar.gz
frameworks_base-51374fc706c8d83f481a498bb582dea4be388058.tar.bz2
frameworks_base-51374fc706c8d83f481a498bb582dea4be388058.zip
Merge "Tracks app window animation endpoint" into qt-dev
-rw-r--r--services/core/java/com/android/server/wm/AppWindowToken.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java
index ecbecbafd3d..3d7e50d91b0 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 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
protected void onAnimationFinished() {
super.onAnimationFinished();
+ Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "AWT#onAnimationFinished");
mTransit = TRANSIT_UNSET;
mTransitFlags = 0;
mNeedsZBoost = false;
@@ -2816,6 +2817,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
scheduleAnimation();
mActivityRecord.onAnimationFinished();
+ Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
}
@Override