2 files changed, 15 insertions, 0 deletions
diff --git a/hierarchyviewer/src/com/android/hierarchyviewer/HierarchyViewer.java b/hierarchyviewer/src/com/android/hierarchyviewer/HierarchyViewer.java
index 59ce67f..e945987 100644
--- a/hierarchyviewer/src/com/android/hierarchyviewer/HierarchyViewer.java
+++ b/hierarchyviewer/src/com/android/hierarchyviewer/HierarchyViewer.java
@@ -27,6 +27,12 @@ public class HierarchyViewer {
     private static final CharSequence OS_WINDOWS = "Windows";
     private static final CharSequence OS_MACOSX = "Mac OS X";
 
+    private static boolean sProfilingEnabled = true;
+
+    public static boolean isProfilingEnabled() {
+        return sProfilingEnabled;
+    }
+
     private static void initUserInterface() {
         System.setProperty("apple.laf.useScreenMenuBar", "true");
         System.setProperty("apple.awt.brushMetalLook", "true");
@@ -52,6 +58,10 @@ public class HierarchyViewer {
     }
 
     public static void main(String[] args) {
+        if (args.length > 0) {
+            sProfilingEnabled = !args[0].equalsIgnoreCase("-profiling=false");
+        }
+
         initUserInterface();
         DeviceBridge.initDebugBridge();
 
diff --git a/hierarchyviewer/src/com/android/hierarchyviewer/scene/ProfilesLoader.java b/hierarchyviewer/src/com/android/hierarchyviewer/scene/ProfilesLoader.java
index b91db79..4b9d524 100644
--- a/hierarchyviewer/src/com/android/hierarchyviewer/scene/ProfilesLoader.java
+++ b/hierarchyviewer/src/com/android/hierarchyviewer/scene/ProfilesLoader.java
@@ -17,6 +17,7 @@
 package com.android.hierarchyviewer.scene;
 
 import com.android.ddmlib.IDevice;
+import com.android.hierarchyviewer.HierarchyViewer;
 import com.android.hierarchyviewer.device.Window;
 import com.android.hierarchyviewer.device.DeviceBridge;
 
@@ -30,6 +31,10 @@ import java.io.InputStreamReader;
 
 public class ProfilesLoader {
     public static double[] loadProfiles(IDevice device, Window window, String params) {
+        if (!HierarchyViewer.isProfilingEnabled()) {
+            return new double[] { 0.0, 0.0, 0.0 };
+        }
+        
         Socket socket = null;
         BufferedReader in = null;
         BufferedWriter out = null;