Merge "adb: fix adb trace tag"

This commit is contained in:
Treehugger Robot 2016-12-17 00:07:41 +00:00 committed by Gerrit Code Review
commit 94dd4b7410

View file

@ -109,8 +109,8 @@ static void setup_trace_mask() {
} }
std::unordered_map<std::string, int> trace_flags = { std::unordered_map<std::string, int> trace_flags = {
{"1", 0}, {"1", -1},
{"all", 0}, {"all", -1},
{"adb", ADB}, {"adb", ADB},
{"sockets", SOCKETS}, {"sockets", SOCKETS},
{"packets", PACKETS}, {"packets", PACKETS},
@ -133,8 +133,8 @@ static void setup_trace_mask() {
continue; continue;
} }
if (flag->second == 0) { if (flag->second == -1) {
// 0 is used for the special values "1" and "all" that enable all // -1 is used for the special values "1" and "all" that enable all
// tracing. // tracing.
adb_trace_mask = ~0; adb_trace_mask = ~0;
return; return;