openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "fuzzy_fastboot: use 'tcp:' prefix to identify fastboot protocol." am: 53122b14bc 

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

Change-Id: I73dca84b1908e1c2c0b45e53a75d4559e3dace51
This commit is contained in:
Treehugger Robot 2020-06-15 20:13:32 +00:00 committed by Automerger Merge Worker
parent 41ef412238 53122b14bc
commit 35fd48b54a
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fastboot/fuzzy_fastboot/fixtures.cpp
View File

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