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

Commit 28505419 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "libsparse: Don't spam errors in sparse_file_import_auto." am:... 

Merge "libsparse: Don't spam errors in sparse_file_import_auto." am: bed6eea3 am: 5b8a2a6e am: bc10150e

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



Change-Id: Ice922fbec3abcb2fa24fa2b07fc2a0d4002e816e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4eac2b0b bc10150e

libsparse/sparse_read.cpp

+4 −1
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ struct sparse_file* sparse_file_import_auto(int fd, bool crc, bool verbose) { 
  int64_t len;

  int ret;



  s = sparse_file_import(fd, verbose, crc);

  s = sparse_file_import(fd, false, crc);

  if (s) {

    return s;

  }
@@ -686,6 +686,9 @@ struct sparse_file* sparse_file_import_auto(int fd, bool crc, bool verbose) { 
  if (!s) {

    return nullptr;

  }

  if (verbose) {

    sparse_file_verbose(s);

  }



  ret = sparse_file_read_normal(s, fd);

  if (ret < 0) {