Remove unnecessary last_error_ field am: 8ab0f41066 am: ce7af8b115
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/3391042
Change-Id: I68204447b5f546cf5198e86a6c1b3b79a63171c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/aosp/update_attempter_android.cc b/aosp/update_attempter_android.cc
index 85f650c..f29383a 100644
--- a/aosp/update_attempter_android.cc
+++ b/aosp/update_attempter_android.cc
@@ -506,10 +506,6 @@
"Status reset not allowed in this state, please "
"cancel on going OTA first.");
}
- // last_error_ is used by setShouldSwitchSlot to determine if
- // FilesystemVerification is done. Since we are discarding update
- // state, discard this cache as well.
- last_error_ = ErrorCode::kSuccess;
if (apex_handler_android_ != nullptr) {
LOG(INFO) << "Cleaning up reserved space for compressed APEX (if any)";
@@ -715,7 +711,6 @@
LOG(INFO) << "Processing Done.";
metric_bytes_downloaded_.Flush(true);
metric_total_bytes_downloaded_.Flush(true);
- last_error_ = code;
if (status_ == UpdateStatus::CLEANUP_PREVIOUS_UPDATE) {
TerminateUpdateAndNotify(code);
return;
@@ -1354,11 +1349,13 @@
std::make_unique<PostinstallRunnerAction>(boot_control_, hardware_);
postinstall_runner_action->set_delegate(this);
- // If last error code is kUpdatedButNotActive, we know that we reached this
- // state by calling applyPayload() with switch_slot=false. That applyPayload()
- // call would have already performed filesystem verification, therefore, we
+ // If |kPrefsPostInstallSucceeded| is set, we know that we reached this
+ // state by calling applyPayload() That applyPayload() call would have
+ // already performed filesystem verification, therefore, we
// can safely skip the verification to save time.
- if (last_error_ == ErrorCode::kUpdatedButNotActive) {
+ bool postinstall_succeeded = false;
+ if (prefs_->GetBoolean(kPrefsPostInstallSucceeded, &postinstall_succeeded) &&
+ postinstall_succeeded) {
auto install_plan_action =
std::make_unique<InstallPlanAction>(install_plan_);
BondActions(install_plan_action.get(), postinstall_runner_action.get());
diff --git a/aosp/update_attempter_android.h b/aosp/update_attempter_android.h
index eb3e29f..ac0cc51 100644
--- a/aosp/update_attempter_android.h
+++ b/aosp/update_attempter_android.h
@@ -287,7 +287,6 @@
// The path to the zip file with X509 certificates.
std::string update_certificates_path_{constants::kUpdateCertificatesPath};
- ErrorCode last_error_{ErrorCode::kSuccess};
metrics_utils::PersistedValue<int64_t> metric_bytes_downloaded_;
metrics_utils::PersistedValue<int64_t> metric_total_bytes_downloaded_;