tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Minor fixes to fastboot_driver"

Browse source 
am: 8cf510ff81

Change-Id: I358512c168fbe19c164bb201cf57accdb613f1a3
This commit is contained in:
Aaron Wisner 2018-08-02 17:49:30 -07:00 committed by android-build-merger
commit 794fb0107b
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
fastboot/fastboot_driver.cpp
View file

@ -134,7 +134,7 @@ RetCode FastBootDriver::Partitions(std::vector<std::tuple<std::string, uint32_t>
return ret;
}
std::regex reg("partition-size[[:s:]]*:[[:s:]]*([[:w:]]+)[[:s:]]*:[[:s:]]*0x([[:d:]]+)");
std::regex reg("partition-size[[:s:]]*:[[:s:]]*([[:w:]]+)[[:s:]]*:[[:s:]]*0x([[:xdigit:]]+)");
std::smatch sm;
for (auto& s : all) {
@ -264,11 +264,16 @@ RetCode FastBootDriver::Upload(const std::string& outfile, std::string* response
std::vector<std::string>* info) {
RetCode ret;
int dsize;
if ((ret = RawCommand(Commands::UPLOAD, response, info, &dsize)) || dsize == 0) {
error_ = "Upload request failed";
if ((ret = RawCommand(Commands::UPLOAD, response, info, &dsize))) {
error_ = "Upload request failed: " + error_;
return ret;
}
if (!dsize) {
error_ = "Upload request failed, device reports 0 bytes available";
return BAD_DEV_RESP;
}
std::vector<char> data;
data.resize(dsize);
@ -462,10 +467,10 @@ RetCode FastBootDriver::SendBuffer(const std::vector<char>& buf) {
}
RetCode FastBootDriver::SendBuffer(const void* buf, size_t size) {
// ioctl on 0-length buffer causes freezing
if (!size) {
return SUCCESS;
return BAD_ARG;
}
// Write the buffer
ssize_t tmp = transport->Write(buf, size);
@ -521,7 +526,7 @@ int FastBootDriver::SparseWriteCallback(std::vector<char>& tpbuf, const char* da
// Now we need to send a multiple of chunk size
size_t nchunks = (len - total) / TRANSPORT_CHUNK_SIZE;
size_t nbytes = TRANSPORT_CHUNK_SIZE * nchunks;
if (SendBuffer(data + total, nbytes)) {
if (nbytes && SendBuffer(data + total, nbytes)) { // Don't send a ZLP
error_ = ErrnoStr("Send failed in SparseWriteCallback()");
return -1;
}

2
fastboot/fastboot_driver.h
View file

@ -103,7 +103,7 @@ class FastBootDriver {
/* HELPERS */
void SetInfoCallback(std::function<void(std::string&)> info);
const std::string RCString(RetCode rc);
static const std::string RCString(RetCode rc);
std::string Error();
RetCode WaitForDisconnect();