summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2019-11-19 00:55:12 +0100
committerandroid-build-merger <android-build-merger@google.com>2019-11-19 00:55:12 +0100
commit7d0047516296144a156465fb59a1efb16fa960f3 (patch)
tree581c0a53f1c772350dcc7132fee112199272d78c
parentMerge "Force merges to complete before wiping data or metadata." am: 8444dec7ac am: bc4b39efff (diff)
parentMerge "Clear the warm_reset flag after boot is successful" am: ca18e7fe5a (diff)
downloadandroid_bootable_recovery-7d0047516296144a156465fb59a1efb16fa960f3.tar
android_bootable_recovery-7d0047516296144a156465fb59a1efb16fa960f3.tar.gz
android_bootable_recovery-7d0047516296144a156465fb59a1efb16fa960f3.tar.bz2
android_bootable_recovery-7d0047516296144a156465fb59a1efb16fa960f3.tar.lz
android_bootable_recovery-7d0047516296144a156465fb59a1efb16fa960f3.tar.xz
android_bootable_recovery-7d0047516296144a156465fb59a1efb16fa960f3.tar.zst
android_bootable_recovery-7d0047516296144a156465fb59a1efb16fa960f3.zip
Diffstat (limited to '')
-rw-r--r--update_verifier/update_verifier.cpp4
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.";
}