commit 040b946da1d1483d5bc97a5d76f79ed7de2dc91f
author Elliott Hughes <enh@google.com> Wed Jan 28 00:42:55 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 28 00:42:55 2015 +0000
tree c455b5352f3b6440250ff1f407d40081f6f3791b
parent 3f83554d220300a399c084d8b7b48a21c4402feb
parent 13aa2a4e32ea0ba84ca5a62cb1767cb7f449aba1

am 13aa2a4e: am 9e376744: Merge "adb: tracing: don\'t make strings if runtime tracing is disabled"

* commit '13aa2a4e32ea0ba84ca5a62cb1767cb7f449aba1':
  adb: tracing: don't make strings if runtime tracing is disabled

adb/transport.c

diff --git a/adb/transport.c b/adb/transport.c
index 7db6a47..ffe59da 100644
--- a/adb/transport.c
+++ b/adb/transport.c
@@ -1165,7 +1165,9 @@
 
 #if ADB_TRACE
     D("readx: fd=%d wanted=%zu got=%zu\n", fd, len0, len0 - len);
-    dump_hex( ptr, len0 );
+    if (ADB_TRACING) {
+        dump_hex( ptr, len0 );
+    }
 #endif
     return 0;
 }
@@ -1177,7 +1179,9 @@
 
 #if ADB_TRACE
     D("writex: fd=%d len=%d: ", fd, (int)len);
-    dump_hex( ptr, len );
+    if (ADB_TRACING) {
+        dump_hex( ptr, len );
+    }
 #endif
     while(len > 0) {
         r = adb_write(fd, p, len);