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

Commit 62d65862 authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge "WA: Fix adb wait-for-device command" am: bf867cac 

am: 4da27b10

* commit '4da27b10':
  WA: Fix adb wait-for-device command
parents f01db4f6 4da27b10

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;