summaryrefslogtreecommitdiffstats
path: root/install/adb_install.cpp
diff options
context:
space:
mode:
authorxunchang <xunchang@google.com>2019-04-13 01:22:15 +0200
committerTianjie Xu <xunchang@google.com>2019-04-16 21:26:31 +0200
commit388d253b9cf4d12ca7879d29dc6711ad44541ccd (patch)
tree2069cc9c8787f11bc4eda1de32f69697b6946b46 /install/adb_install.cpp
parentDO NOT MERGE: Add socket communication between recovery and minadbd (diff)
downloadandroid_bootable_recovery-388d253b9cf4d12ca7879d29dc6711ad44541ccd.tar
android_bootable_recovery-388d253b9cf4d12ca7879d29dc6711ad44541ccd.tar.gz
android_bootable_recovery-388d253b9cf4d12ca7879d29dc6711ad44541ccd.tar.bz2
android_bootable_recovery-388d253b9cf4d12ca7879d29dc6711ad44541ccd.tar.lz
android_bootable_recovery-388d253b9cf4d12ca7879d29dc6711ad44541ccd.tar.xz
android_bootable_recovery-388d253b9cf4d12ca7879d29dc6711ad44541ccd.tar.zst
android_bootable_recovery-388d253b9cf4d12ca7879d29dc6711ad44541ccd.zip
Diffstat (limited to 'install/adb_install.cpp')
-rw-r--r--install/adb_install.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/install/adb_install.cpp b/install/adb_install.cpp
index dc7ee0b32..548b6e5b9 100644
--- a/install/adb_install.cpp
+++ b/install/adb_install.cpp
@@ -81,7 +81,7 @@ static bool WriteStatusToFd(MinadbdCommandStatus status, int fd) {
}
// Installs the package from FUSE. Returns true if the installation succeeds, and false otherwise.
-static bool AdbInstallPackageHandler(bool* wipe_cache, RecoveryUI* ui, int* result) {
+static bool AdbInstallPackageHandler(RecoveryUI* ui, int* result) {
// How long (in seconds) we wait for the package path to be ready. It doesn't need to be too long
// because the minadbd service has already issued an install command. FUSE_SIDELOAD_HOST_PATHNAME
// will start to exist once the host connects and starts serving a package. Poll for its
@@ -99,7 +99,7 @@ static bool AdbInstallPackageHandler(bool* wipe_cache, RecoveryUI* ui, int* resu
break;
}
}
- *result = install_package(FUSE_SIDELOAD_HOST_PATHNAME, wipe_cache, false, 0, ui);
+ *result = install_package(FUSE_SIDELOAD_HOST_PATHNAME, false, false, 0, ui);
break;
}
@@ -280,7 +280,7 @@ static void CreateMinadbdServiceAndExecuteCommands(
signal(SIGPIPE, SIG_DFL);
}
-int apply_from_adb(bool* wipe_cache, RecoveryUI* ui) {
+int apply_from_adb(RecoveryUI* ui) {
// Save the usb state to restore after the sideload operation.
std::string usb_state = android::base::GetProperty("sys.usb.state", "none");
// Clean up state and stop adbd.
@@ -295,8 +295,7 @@ int apply_from_adb(bool* wipe_cache, RecoveryUI* ui) {
int install_result = INSTALL_ERROR;
std::map<MinadbdCommands, CommandFunction> command_map{
- { MinadbdCommands::kInstall,
- std::bind(&AdbInstallPackageHandler, wipe_cache, ui, &install_result) },
+ { MinadbdCommands::kInstall, std::bind(&AdbInstallPackageHandler, ui, &install_result) },
};
CreateMinadbdServiceAndExecuteCommands(command_map);