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

Commit 94e0776e authored by Leo Sartre's avatar Leo Sartre
Browse files

WA: Fix adb wait-for-device command 



Without -s argument, adb wait-for-device will make a call to
acquire_one_transport() with sinfo->serial.c_str() == "".
Waiting for acquire_one_transport() to be reworked to use std::string
rather than const char * for serial, work around this by passing NULL
when sinfo->serial is not initialized in host_service_to_socket().

Change-Id: Ifef53e0e82850364f5029ee36560376f2a4a5104
Signed-off-by: default avatarLeo Sartre <leox.sartre@intel.com>
parent 100001a5

adb/services.cpp

+3 −2
Original line number Diff line number Diff line
@@ -368,8 +368,9 @@ static void wait_for_state(int fd, void* data) { 
    while (true) {

        bool is_ambiguous = false;

        std::string error = "unknown error";

        atransport* t = acquire_one_transport(sinfo->transport_type, sinfo->serial.c_str(),

                                              &is_ambiguous, &error);

        const char* serial = sinfo->serial.length() ? sinfo->serial.c_str() : NULL;

        atransport* t = acquire_one_transport(sinfo->transport_type, serial, &is_ambiguous, &error);



        if (t != nullptr && t->connection_state == sinfo->state) {

            SendOkay(fd);

            break;