commit aad00fceeafcf5ba0011ae693822b97b261e4ef2
author Daniel Friederich <dfriederich@magicleap.com> Sat Dec 17 00:32:53 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Dec 17 00:32:53 2016 +0000
tree 1417e7075a925227c1ceb186b3caa3a8a3b584e9
parent a65a1a11cb641d6b084b05f25f850f61ce0ac939
parent 2b6b87c4d8c7ebba21ed1934a9734268549942be

Merge "adb: fix adb trace tag" am: 94dd4b7410 am: bc4d167a2d
am: 2b6b87c4d8

Change-Id: Ifb394f1b3b4e7e0b33a6f478bdc7fd89c751f4a9

adb/adb_trace.cpp

diff --git a/adb/adb_trace.cpp b/adb/adb_trace.cpp
index 002d061..c369d60 100644
--- a/adb/adb_trace.cpp
+++ b/adb/adb_trace.cpp
@@ -109,8 +109,8 @@
     }
 
     std::unordered_map<std::string, int> trace_flags = {
-        {"1", 0},
-        {"all", 0},
+        {"1", -1},
+        {"all", -1},
         {"adb", ADB},
         {"sockets", SOCKETS},
         {"packets", PACKETS},
@@ -133,8 +133,8 @@
             continue;
         }
 
-        if (flag->second == 0) {
-            // 0 is used for the special values "1" and "all" that enable all
+        if (flag->second == -1) {
+            // -1 is used for the special values "1" and "all" that enable all
             // tracing.
             adb_trace_mask = ~0;
             return;