commit 7dff1a72146ba549d51649ad786a0e1cc8b6897c
author Romain Guy <romainguy@google.com> Mon Aug 30 12:48:45 2010 -0700
committer Romain Guy <romainguy@google.com> Mon Aug 30 12:49:07 2010 -0700
tree 34dd9801347335c13af810deed64bf2f44806cd2
parent da2ccb49b1c9941db3a4713df0b6020ba7d1e801

Make profiling easier.

Change-Id: I3d4a0a0ead72569a8950bc986dfe584b186e0d65

core/java/android/view/ViewRoot.java

diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java
index a91d2bd..7f1c0fb 100644
--- a/core/java/android/view/ViewRoot.java
+++ b/core/java/android/view/ViewRoot.java
@@ -1026,7 +1026,7 @@
                 TAG, "Laying out " + host + " to (" +
                 host.mMeasuredWidth + ", " + host.mMeasuredHeight + ")");
             long startTime = 0L;
-            if (Config.DEBUG && ViewDebug.profileLayout) {
+            if (ViewDebug.profileLayout) {
                 startTime = SystemClock.elapsedRealtime();
             }
             host.layout(0, 0, host.mMeasuredWidth, host.mMeasuredHeight);
@@ -1039,7 +1039,7 @@
                 }
             }
 
-            if (Config.DEBUG && ViewDebug.profileLayout) {
+            if (ViewDebug.profileLayout) {
                 EventLog.writeEvent(60001, SystemClock.elapsedRealtime() - startTime);
             }
 
@@ -1339,7 +1339,7 @@
                         //canvas.drawARGB(255, 255, 0, 0);
                     }
 
-                    if (Config.DEBUG && ViewDebug.profileDrawing) {
+                    if (ViewDebug.profileDrawing) {
                         startTime = SystemClock.elapsedRealtime();
                     }
 
@@ -1382,7 +1382,7 @@
                         mView.dispatchConsistencyCheck(ViewDebug.CONSISTENCY_DRAWING);
                     }
 
-                    if (SHOW_FPS || Config.DEBUG && ViewDebug.showFps) {
+                    if (SHOW_FPS || ViewDebug.showFps) {
                         int now = (int)SystemClock.elapsedRealtime();
                         if (sDrawTime != 0) {
                             nativeShowFPS(canvas, now - sDrawTime);
@@ -1390,7 +1390,7 @@
                         sDrawTime = now;
                     }
 
-                    if (Config.DEBUG && ViewDebug.profileDrawing) {
+                    if (ViewDebug.profileDrawing) {
                         EventLog.writeEvent(60000, SystemClock.elapsedRealtime() - startTime);
                     }
                 }