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

Commit b6441348 authored by Daniel Friederich's avatar Daniel Friederich
Browse files

adb: fix adb trace tag 

The ADB trace enum value collided with the 0 values used to mean all, hence it
was not possible to just trace the ADB tagged messages without also tracing everything else.

Change-Id: I15ff9c50c4ac01806c4841cf8213ce859faf130b
Test: Manually by setting ADB_TRACE and running adb, e.g. "ADB_TRACE=adb adb shell ls"
parent 55735986

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;