diff options
| author | Tianjie Xu <xunchang@google.com> | 2020-03-19 00:49:15 +0100 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-19 00:49:15 +0100 |
| commit | 32d28f90f08c8f151d7c018b1921e3672da7f8c6 (patch) | |
| tree | 00ee997b3bfb0ea0243b38de336eec8593ac3f2c /otautil | |
| parent | Merge "Add more mounting options to updater mount function." into rvc-dev am: 342e53d045 (diff) | |
| parent | Consolidate the wait in recovery's reboot (diff) | |
| download | android_bootable_recovery-32d28f90f08c8f151d7c018b1921e3672da7f8c6.tar android_bootable_recovery-32d28f90f08c8f151d7c018b1921e3672da7f8c6.tar.gz android_bootable_recovery-32d28f90f08c8f151d7c018b1921e3672da7f8c6.tar.bz2 android_bootable_recovery-32d28f90f08c8f151d7c018b1921e3672da7f8c6.tar.lz android_bootable_recovery-32d28f90f08c8f151d7c018b1921e3672da7f8c6.tar.xz android_bootable_recovery-32d28f90f08c8f151d7c018b1921e3672da7f8c6.tar.zst android_bootable_recovery-32d28f90f08c8f151d7c018b1921e3672da7f8c6.zip | |
Diffstat (limited to 'otautil')
| -rw-r--r-- | otautil/include/otautil/sysutil.h | 2 | ||||
| -rw-r--r-- | otautil/sysutil.cpp | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/otautil/include/otautil/sysutil.h b/otautil/include/otautil/sysutil.h index 326db8644..d0d2e67d7 100644 --- a/otautil/include/otautil/sysutil.h +++ b/otautil/include/otautil/sysutil.h @@ -103,7 +103,7 @@ class MemMapping { // Reboots the device into the specified target, by additionally handling quiescent reboot mode. // All unknown targets reboot into Android. -bool Reboot(std::string_view target); +[[noreturn]] void Reboot(std::string_view target); // Triggers a shutdown. bool Shutdown(std::string_view target); diff --git a/otautil/sysutil.cpp b/otautil/sysutil.cpp index 6cd46c6a9..b3ead9736 100644 --- a/otautil/sysutil.cpp +++ b/otautil/sysutil.cpp @@ -219,14 +219,18 @@ MemMapping::~MemMapping() { ranges_.clear(); } -bool Reboot(std::string_view target) { +void Reboot(std::string_view target) { std::string cmd = "reboot," + std::string(target); // Honor the quiescent mode if applicable. if (target != "bootloader" && target != "fastboot" && android::base::GetBoolProperty("ro.boot.quiescent", false)) { cmd += ",quiescent"; } - return android::base::SetProperty(ANDROID_RB_PROPERTY, cmd); + if (!android::base::SetProperty(ANDROID_RB_PROPERTY, cmd)) { + LOG(FATAL) << "Reboot failed"; + } + + while (true) pause(); } bool Shutdown(std::string_view target) { |