Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c63439ae authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge \"Better diagnostics from \"adb sideload\".\"

am: edd401e2

Change-Id: I36b23f7533bbd4d6d9d9e171c297155846734a63
parents b94f3c59 edd401e2
Loading
Loading
Loading
Loading
+4 −5
Original line number Diff line number Diff line
@@ -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);
    }