commit 6a6644c739f6f0aec2955b2ebb75a310d9aa167d
author Jorim Jaggi <jjaggi@google.com> Tue Oct 27 17:04:50 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 27 17:04:50 2015 +0000
tree d517703b48329c55534839ecce5173a125d56f37
parent f0e209ca098165dc25d30015f155aaffde9c0a6e
parent d9cabc50d1863973a169d02880b22c0c4eef9ba7

Merge "Add traces when windows are animating"

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

diff --git a/services/core/java/com/android/server/wm/WindowAnimator.java b/services/core/java/com/android/server/wm/WindowAnimator.java
index be86e2f..f4a4140 100644
--- a/services/core/java/com/android/server/wm/WindowAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowAnimator.java
@@ -31,6 +31,7 @@
 
 import android.content.Context;
 import android.os.RemoteException;
+import android.os.Trace;
 import android.util.Slog;
 import android.util.SparseArray;
 import android.util.TimeUtils;
@@ -731,8 +732,15 @@
             mWindowPlacerLocked.requestTraversal();
         }
 
+        if (mAnimating && !wasAnimating && Trace.isTagEnabled(Trace.TRACE_TAG_WINDOW_MANAGER)) {
+            Trace.asyncTraceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "animating", 0);
+        }
+
         if (!mAnimating && wasAnimating) {
             mWindowPlacerLocked.requestTraversal();
+            if (Trace.isTagEnabled(Trace.TRACE_TAG_WINDOW_MANAGER)) {
+                Trace.asyncTraceEnd(Trace.TRACE_TAG_WINDOW_MANAGER, "animating", 0);
+            }
         }
 
         mService.destroyPreservedSurfaceLocked();