| commit | 730e76cf93874a5aa9c8eb9fd2704e45fa53b9e5 | [log] [tgz] |
|---|---|---|
| author | Kelvin Zhang <zhangkelvin@google.com> | Thu Dec 17 03:06:48 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 17 03:06:48 2020 +0000 |
| tree | c126570ace62be215c19f74e1c73eb254a121716 | |
| parent | a188620abd2033e5cf11231b445b1be806f4b981 [diff] | |
| parent | bfb78c318e88738db7ae1b7e448a9e280ba40453 [diff] |
Unconditionally save checkpoints when force = true am: 3265b317b3 am: bfb78c318e Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1532419 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie74ec7e1786fc01aebc65ab5bdb1c785344bba5f
diff --git a/payload_consumer/delta_performer.cc b/payload_consumer/delta_performer.cc index a10815b..5b41485 100644 --- a/payload_consumer/delta_performer.cc +++ b/payload_consumer/delta_performer.cc
@@ -1421,7 +1421,7 @@ return false; } Terminator::set_exit_blocked(true); - if (last_updated_operation_num_ != next_operation_num_) { + if (last_updated_operation_num_ != next_operation_num_ || force) { // Resets the progress in case we die in the middle of the state update. ResetUpdateProgress(prefs_, true); TEST_AND_RETURN_FALSE(prefs_->SetString(