diff options
| author | Tianjie Xu <xunchang@google.com> | 2019-11-19 00:39:42 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-19 00:39:42 +0100 |
| commit | 6ca0488c4abe808a1dcbefb55208be50443fe9c6 (patch) | |
| tree | 99deb3f12236fe0d31efd60215f2fa0f117fa4d4 | |
| parent | Merge "Force merges to complete before wiping data or metadata." (diff) | |
| parent | Merge "Clear the warm_reset flag after boot is successful" (diff) | |
| download | android_bootable_recovery-6ca0488c4abe808a1dcbefb55208be50443fe9c6.tar android_bootable_recovery-6ca0488c4abe808a1dcbefb55208be50443fe9c6.tar.gz android_bootable_recovery-6ca0488c4abe808a1dcbefb55208be50443fe9c6.tar.bz2 android_bootable_recovery-6ca0488c4abe808a1dcbefb55208be50443fe9c6.tar.lz android_bootable_recovery-6ca0488c4abe808a1dcbefb55208be50443fe9c6.tar.xz android_bootable_recovery-6ca0488c4abe808a1dcbefb55208be50443fe9c6.tar.zst android_bootable_recovery-6ca0488c4abe808a1dcbefb55208be50443fe9c6.zip | |
| -rw-r--r-- | update_verifier/update_verifier.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp index d04c455d8..a042f9008 100644 --- a/update_verifier/update_verifier.cpp +++ b/update_verifier/update_verifier.cpp @@ -371,6 +371,10 @@ int update_verifier(int argc, char** argv) { return reboot_device(); } LOG(INFO) << "Marked slot " << current_slot << " as booted successfully."; + // Clears the warm reset flag for next reboot. + if (!android::base::SetProperty("ota.warm_reset", "0")) { + LOG(WARNING) << "Failed to reset the warm reset flag"; + } } else { LOG(INFO) << "Deferred marking slot " << current_slot << " as booted successfully."; } |