| commit | e8de85a767041816488c379f90d4e91f591e83a1 | [log] [tgz] |
|---|---|---|
| author | Kelvin Zhang <zhangkelvin@google.com> | Thu Dec 17 03:44:47 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 17 03:44:47 2020 +0000 |
| tree | b0d83cb0d465ff0b49d2a92c1650745d6dc4a693 | |
| parent | 6b112574339dcfad52d1389b2be2be24dc00ecfc [diff] | |
| parent | 730e76cf93874a5aa9c8eb9fd2704e45fa53b9e5 [diff] |
Unconditionally save checkpoints when force = true am: 3265b317b3 am: bfb78c318e am: 730e76cf93 Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1532419 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic9644987e9f446cf70787cd5a66368037e0721e6
diff --git a/payload_consumer/delta_performer.cc b/payload_consumer/delta_performer.cc index 24dfd3e..a9461ac 100644 --- a/payload_consumer/delta_performer.cc +++ b/payload_consumer/delta_performer.cc
@@ -1418,7 +1418,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(