diff options
author | Tianjie Xu <xunchang@google.com> | 2019-07-10 22:59:32 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-10 22:59:32 +0200 |
commit | f6e8941ee978f16e161fe1d8443ab72828d1433a (patch) | |
tree | 15e028fddab0693f79f8ac7c789a5fc642a2c3b9 /install/fuse_install.cpp | |
parent | Merge "Change the symlink to system_ext" am: c992962503 (diff) | |
parent | Merge "Create a fallback to install from fuse if mmap fails" (diff) | |
download | android_bootable_recovery-f6e8941ee978f16e161fe1d8443ab72828d1433a.tar android_bootable_recovery-f6e8941ee978f16e161fe1d8443ab72828d1433a.tar.gz android_bootable_recovery-f6e8941ee978f16e161fe1d8443ab72828d1433a.tar.bz2 android_bootable_recovery-f6e8941ee978f16e161fe1d8443ab72828d1433a.tar.lz android_bootable_recovery-f6e8941ee978f16e161fe1d8443ab72828d1433a.tar.xz android_bootable_recovery-f6e8941ee978f16e161fe1d8443ab72828d1433a.tar.zst android_bootable_recovery-f6e8941ee978f16e161fe1d8443ab72828d1433a.zip |
Diffstat (limited to 'install/fuse_install.cpp')
-rw-r--r-- | install/fuse_install.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/install/fuse_install.cpp b/install/fuse_install.cpp index ffde4a348..8a7a278e0 100644 --- a/install/fuse_install.cpp +++ b/install/fuse_install.cpp @@ -128,11 +128,12 @@ static bool StartInstallPackageFuse(std::string_view path) { constexpr auto FUSE_BLOCK_SIZE = 65536; bool is_block_map = android::base::ConsumePrefix(&path, "@"); - auto file_data_reader = + auto fuse_data_provider = is_block_map ? FuseBlockDataProvider::CreateFromBlockMap(std::string(path), FUSE_BLOCK_SIZE) : FuseFileDataProvider::CreateFromFile(std::string(path), FUSE_BLOCK_SIZE); - if (!file_data_reader->Valid()) { + if (!fuse_data_provider || !fuse_data_provider->Valid()) { + LOG(ERROR) << "Failed to create fuse data provider."; return false; } @@ -142,7 +143,7 @@ static bool StartInstallPackageFuse(std::string_view path) { umount2(SDCARD_ROOT, MNT_DETACH); } - return run_fuse_sideload(std::move(file_data_reader)) == 0; + return run_fuse_sideload(std::move(fuse_data_provider)) == 0; } InstallResult InstallWithFuseFromPath(std::string_view path, RecoveryUI* ui) { |