Implement suspend, resume and cancel the download.
The DownloadAction can now be suspended and resumed, using the existing
libcurl hooks to pause the download. For canceling an ongoing update,
this patch leverages the existing StopProcessing method previously used
in unittest only with a slight change: Stopping the ActionProcessor
also removes all the pending actions.
The LibcurlHttpFetcher Pause/Unpause methods where improved to support
(not crash) if paused in circumstances where there isn't a current
connection, like when waiting for the proxy resolver and when trying to
reconnect.
Finally, the value of ongoing_update_ is now properly set in the
UpdateAttempter.
Bug: 27047026
TEST=Tested suspending, resuming and canceling the update on a device.
TEST=Added unittest for the Pause/Unpause logic.
Change-Id: I0df1e1a8cf70a3b736bc9cd4899d37813f381b94
diff --git a/update_attempter_android.cc b/update_attempter_android.cc
index c10b080..6f88ee7 100644
--- a/update_attempter_android.cc
+++ b/update_attempter_android.cc
@@ -173,6 +173,7 @@
SetupDownload();
cpu_limiter_.StartLimiter();
SetStatusAndNotify(UpdateStatus::UPDATE_AVAILABLE);
+ ongoing_update_ = true;
// Just in case we didn't update boot flags yet, make sure they're updated
// before any update processing starts. This will start the update process.
@@ -181,23 +182,24 @@
}
bool UpdateAttempterAndroid::SuspendUpdate(brillo::ErrorPtr* error) {
- // TODO(deymo): Implement suspend/resume.
- return LogAndSetError(error, FROM_HERE, "Suspend/resume not implemented");
+ if (!ongoing_update_)
+ return LogAndSetError(error, FROM_HERE, "No ongoing update to suspend.");
+ processor_->SuspendProcessing();
+ return true;
}
bool UpdateAttempterAndroid::ResumeUpdate(brillo::ErrorPtr* error) {
- // TODO(deymo): Implement suspend/resume.
- return LogAndSetError(error, FROM_HERE, "Suspend/resume not implemented");
+ if (!ongoing_update_)
+ return LogAndSetError(error, FROM_HERE, "No ongoing update to resume.");
+ processor_->ResumeProcessing();
+ return true;
}
bool UpdateAttempterAndroid::CancelUpdate(brillo::ErrorPtr* error) {
- if (status_ == UpdateStatus::IDLE ||
- status_ == UpdateStatus::UPDATED_NEED_REBOOT) {
+ if (!ongoing_update_)
return LogAndSetError(error, FROM_HERE, "No ongoing update to cancel.");
- }
-
- // TODO(deymo): Implement cancel.
- return LogAndSetError(error, FROM_HERE, "Cancel not implemented");
+ processor_->StopProcessing();
+ return true;
}
bool UpdateAttempterAndroid::ResetStatus(brillo::ErrorPtr* error) {