Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b6b87c4 authored by Daniel Friederich's avatar Daniel Friederich Committed by android-build-merger
Browse files

Merge "adb: fix adb trace tag" am: 94dd4b74 

am: bc4d167a

Change-Id: I0b772f2281bed7e12f64eb5005dadda3669d1d5e
parents 1465c327 bc4d167a

adb/adb_trace.cpp

+4 −4
Original line number Diff line number Diff line
@@ -109,8 +109,8 @@ static void setup_trace_mask() { 
    }



    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 @@ static void setup_trace_mask() { 
            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;