Merge "fuzzy_fastboot: use 'tcp:' prefix to identify fastboot protocol." into android10-tests-dev (da84e29f) · Commits · e / os / android_system_core

fastboot/fuzzy_fastboot/fixtures.cpp

+10 −15

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

	#include <android-base/stringprintf.h>		#include <android-base/stringprintf.h>
			#include <android-base/strings.h>
	#include <gtest/gtest.h>		#include <gtest/gtest.h>

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

	bool FastBootTest::IsFastbootOverTcp() {		bool FastBootTest::IsFastbootOverTcp() {
	// serial contains ":" is treated as host ip and port number		return android::base::StartsWith(device_serial, "tcp:");
	return (device_serial.find(":") != std::string::npos);
	}		}

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

	void FastBootTest::ConnectTcpFastbootDevice() {		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++) {		for (int i = 0; i < MAX_TCP_TRIES && !transport; i++) {
	std::string error;		std::string error;
	std::unique_ptr<Transport> tcp(		std::unique_ptr<Transport> tcp(
	tcp::Connect(device_serial.substr(0, found), tcp::kDefaultPort, &error)		tcp::Connect(device_serial.substr(4), tcp::kDefaultPort, &error).release());
	.release());
	if (tcp)		if (tcp)
	transport =		transport = std::unique_ptr<TransportSniffer>(new TransportSniffer(std::move(tcp), 0));
	std::unique_ptr<TransportSniffer>(new TransportSniffer(std::move(tcp), 0));
	if (transport != nullptr) break;		if (transport != nullptr) break;
	std::this_thread::sleep_for(std::chrono::milliseconds(10));		std::this_thread::sleep_for(std::chrono::milliseconds(10));
	}		}
	}		}
	}

	void FastBootTest::ReconnectFastbootDevice() {		void FastBootTest::ReconnectFastbootDevice() {
	fb.reset();		fb.reset();