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

Commit fe1eba00 authored by Josh Gao's avatar Josh Gao Committed by Gerrit Code Review
Browse files

Merge "adb: fix timeout-related test flakiness."

parents ac46ab3c 1115e29f

adb/client/commandline.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1149,7 +1149,7 @@ static bool adb_root(const char* command) { 
    // If we were using a specific transport ID, there's nothing we can wait for.

    if (previous_id == 0) {

        adb_set_transport(previous_type, previous_serial, 0);

        wait_for_device("wait-for-device", 6000ms);

        wait_for_device("wait-for-device", 12000ms);

    }



    return true;

adb/transport.cpp

+2 −2
Original line number Diff line number Diff line
@@ -129,8 +129,8 @@ class ReconnectHandler { 
    };



    // Only retry for up to one minute.

    static constexpr const std::chrono::seconds kDefaultTimeout = 10s;

    static constexpr const size_t kMaxAttempts = 6;

    static constexpr const std::chrono::seconds kDefaultTimeout = 3s;

    static constexpr const size_t kMaxAttempts = 20;



    // Protects all members.

    std::mutex reconnect_mutex_;