summaryrefslogtreecommitdiffstats
path: root/install/fuse_sdcard_install.cpp
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2019-04-16 01:38:43 +0200
committerandroid-build-merger <android-build-merger@google.com>2019-04-16 01:38:43 +0200
commit2e1c88306bebb93bfd10e2b54b1c004968e5136f (patch)
tree0223ab799c88ef1df7c1267696f9eb6f6ddef41d /install/fuse_sdcard_install.cpp
parent[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 0b172415fd -s ours am: 440d03ede2 -s ours (diff)
parentMerge "Move wipe cache|data to libinstall" am: 9fc764f1f0 (diff)
downloadandroid_bootable_recovery-2e1c88306bebb93bfd10e2b54b1c004968e5136f.tar
android_bootable_recovery-2e1c88306bebb93bfd10e2b54b1c004968e5136f.tar.gz
android_bootable_recovery-2e1c88306bebb93bfd10e2b54b1c004968e5136f.tar.bz2
android_bootable_recovery-2e1c88306bebb93bfd10e2b54b1c004968e5136f.tar.lz
android_bootable_recovery-2e1c88306bebb93bfd10e2b54b1c004968e5136f.tar.xz
android_bootable_recovery-2e1c88306bebb93bfd10e2b54b1c004968e5136f.tar.zst
android_bootable_recovery-2e1c88306bebb93bfd10e2b54b1c004968e5136f.zip
Diffstat (limited to 'install/fuse_sdcard_install.cpp')
-rw-r--r--install/fuse_sdcard_install.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/install/fuse_sdcard_install.cpp b/install/fuse_sdcard_install.cpp
index dde289f80..1aa8768e7 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, bool* wipe_cache, RecoveryUI* ui) {
+int ApplyFromSdcard(Device* device, RecoveryUI* ui) {
if (ensure_path_mounted(SDCARD_ROOT) != 0) {
LOG(ERROR) << "\n-- Couldn't mount " << SDCARD_ROOT << ".\n";
return INSTALL_ERROR;
@@ -184,7 +184,7 @@ int ApplyFromSdcard(Device* device, bool* wipe_cache, RecoveryUI* ui) {
}
}
- result = install_package(FUSE_SIDELOAD_HOST_PATHNAME, wipe_cache, false, 0 /*retry_count*/, ui);
+ result = install_package(FUSE_SIDELOAD_HOST_PATHNAME, false, false, 0 /*retry_count*/, ui);
break;
}