ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge \\\"Better diagnostics from \\\"adb sideload\\\".\\\" am: edd401e24e am: c63439ae7f

Browse source 
am: 5a4ab064ec

Change-Id: I52499a4186780fe0249e42bddd9c7726529154a3
This commit is contained in:
Elliott Hughes 2016-06-15 23:39:19 +00:00 • committed by android-build-merger
commit dc369af487
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
adb/commandline.cpp
View file

@ -887,19 +887,18 @@ static int adb_download_buffer(const char *service, const char *fn, const void*
* we hang up.
*/
static int adb_sideload_host(const char* fn) {
printf("loading: '%s'", fn);
fflush(stdout);
fprintf(stderr, "loading: '%s'...\n", fn);
std::string content;
if (!android::base::ReadFileToString(fn, &content)) {
printf("\n");
fprintf(stderr, "* cannot read '%s' *\n", fn);
fprintf(stderr, "failed: %s\n", strerror(errno));
return -1;
}
const uint8_t* data = reinterpret_cast<const uint8_t*>(content.data());
unsigned sz = content.size();
fprintf(stderr, "connecting...\n");
std::string service =
android::base::StringPrintf("sideload-host:%d:%d", sz, SIDELOAD_HOST_BLOCK_SIZE);
std::string error;
@ -907,7 +906,7 @@ static int adb_sideload_host(const char* fn) {
if (fd < 0) {
// Try falling back to the older sideload method. Maybe this
// is an older device that doesn't support sideload-host.
printf("\n");
fprintf(stderr, "falling back to older sideload method...\n");
return adb_download_buffer("sideload", fn, data, sz, true);
}