commit 4a08424f3d68631acf4cb160a3b8a8f8f2ed58da
author Daniel Friederich <dfriederich@magicleap.com> Sat Dec 17 00:24:47 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Dec 17 00:24:47 2016 +0000
tree 1417e7075a925227c1ceb186b3caa3a8a3b584e9
parent 4b467699d54ec1bb4298aa141d6c23240e582f20
parent 494e768298d62becad5c3f695fb8175a7c4c8407

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

Change-Id: I0b772f2281bed7e12f64eb5005dadda3669d1d5e

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;