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

Commit 9c2f03b9 authored by sirius.wang's avatar sirius.wang Committed by Automerger Merge Worker
Browse files

fuzzy_fastboot: use 'tcp:' prefix to identify fastboot protocol. am: 767fe151 

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12448097

Change-Id: I4e1233336d3de093d31aecfd377451114461de46
parents 632b1ab4 767fe151

fastboot/fuzzy_fastboot/fixtures.cpp

+10 −15
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include <vector>



#include <android-base/stringprintf.h>

#include <android-base/strings.h>

#include <gtest/gtest.h>



#include "fastboot_driver.h"
@@ -76,8 +77,7 @@ int FastBootTest::MatchFastboot(usb_ifc_info* info, const std::string& local_ser 
}



bool FastBootTest::IsFastbootOverTcp() {

    // serial contains ":" is treated as host ip and port number

    return (device_serial.find(":") != std::string::npos);

    return android::base::StartsWith(device_serial, "tcp:");

}



bool FastBootTest::UsbStillAvailible() {
@@ -182,21 +182,16 @@ void FastBootTest::TearDownSerial() { 
}



void FastBootTest::ConnectTcpFastbootDevice() {

    std::size_t found = device_serial.find(":");

    if (found != std::string::npos) {

    for (int i = 0; i < MAX_TCP_TRIES && !transport; i++) {

        std::string error;

        std::unique_ptr<Transport> tcp(

                    tcp::Connect(device_serial.substr(0, found), tcp::kDefaultPort, &error)

                            .release());

                tcp::Connect(device_serial.substr(4), tcp::kDefaultPort, &error).release());

        if (tcp)

                transport =

                        std::unique_ptr<TransportSniffer>(new TransportSniffer(std::move(tcp), 0));

            transport = std::unique_ptr<TransportSniffer>(new TransportSniffer(std::move(tcp), 0));

        if (transport != nullptr) break;

        std::this_thread::sleep_for(std::chrono::milliseconds(10));

    }

}

}



void FastBootTest::ReconnectFastbootDevice() {

    fb.reset();