Merge \\\"Fix the sense of a test in \\\"adb sideload\\\".\\\" am: 62cc17de8c am: e9dfa4f753

am: e691def5df

Change-Id: I5320866a7eab668ad1f1d5fd38d57b55b19f3c70
This commit is contained in:
Elliott Hughes 2016-06-13 23:46:20 +00:00 committed by android-build-merger
commit 049da3749a

View file

@ -904,7 +904,7 @@ static int adb_sideload_host(const char* fn) {
android::base::StringPrintf("sideload-host:%d:%d", sz, SIDELOAD_HOST_BLOCK_SIZE); android::base::StringPrintf("sideload-host:%d:%d", sz, SIDELOAD_HOST_BLOCK_SIZE);
std::string error; std::string error;
unique_fd fd(adb_connect(service, &error)); unique_fd fd(adb_connect(service, &error));
if (fd >= 0) { if (fd < 0) {
// Try falling back to the older sideload method. Maybe this // Try falling back to the older sideload method. Maybe this
// is an older device that doesn't support sideload-host. // is an older device that doesn't support sideload-host.
printf("\n"); printf("\n");