diff options
author | Tao Bao <tbao@google.com> | 2019-04-30 23:49:03 +0200 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-04-30 23:49:03 +0200 |
commit | b5fe2dd00c2f04e02d3598e7956eb1374430088f (patch) | |
tree | 13932498e10ef237aee01eeaed417d377f1a9816 /install/fuse_sdcard_install.cpp | |
parent | Merge "tests: Merge recovery_component_test into recovery_unit_test." (diff) | |
parent | install: Install functions return InstallResult. (diff) | |
download | android_bootable_recovery-b5fe2dd00c2f04e02d3598e7956eb1374430088f.tar android_bootable_recovery-b5fe2dd00c2f04e02d3598e7956eb1374430088f.tar.gz android_bootable_recovery-b5fe2dd00c2f04e02d3598e7956eb1374430088f.tar.bz2 android_bootable_recovery-b5fe2dd00c2f04e02d3598e7956eb1374430088f.tar.lz android_bootable_recovery-b5fe2dd00c2f04e02d3598e7956eb1374430088f.tar.xz android_bootable_recovery-b5fe2dd00c2f04e02d3598e7956eb1374430088f.tar.zst android_bootable_recovery-b5fe2dd00c2f04e02d3598e7956eb1374430088f.zip |
Diffstat (limited to 'install/fuse_sdcard_install.cpp')
-rw-r--r-- | install/fuse_sdcard_install.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/install/fuse_sdcard_install.cpp b/install/fuse_sdcard_install.cpp index 1aa8768e7..a5caa6e75 100644 --- a/install/fuse_sdcard_install.cpp +++ b/install/fuse_sdcard_install.cpp @@ -133,7 +133,7 @@ static bool StartSdcardFuse(const std::string& path) { return run_fuse_sideload(std::move(file_data_reader)) == 0; } -int ApplyFromSdcard(Device* device, RecoveryUI* ui) { +InstallResult ApplyFromSdcard(Device* device, RecoveryUI* ui) { if (ensure_path_mounted(SDCARD_ROOT) != 0) { LOG(ERROR) << "\n-- Couldn't mount " << SDCARD_ROOT << ".\n"; return INSTALL_ERROR; @@ -159,9 +159,8 @@ int ApplyFromSdcard(Device* device, RecoveryUI* ui) { _exit(status ? EXIT_SUCCESS : EXIT_FAILURE); } - // FUSE_SIDELOAD_HOST_PATHNAME will start to exist once the fuse in child - // process is ready. - int result = INSTALL_ERROR; + // FUSE_SIDELOAD_HOST_PATHNAME will start to exist once the fuse in child process is ready. + InstallResult result = INSTALL_ERROR; int status; bool waited = false; for (int i = 0; i < SDCARD_INSTALL_TIMEOUT; ++i) { @@ -184,7 +183,7 @@ int ApplyFromSdcard(Device* device, RecoveryUI* ui) { } } - result = install_package(FUSE_SIDELOAD_HOST_PATHNAME, false, false, 0 /*retry_count*/, ui); + result = InstallPackage(FUSE_SIDELOAD_HOST_PATHNAME, false, false, 0 /* retry_count */, ui); break; } |