diff options
Diffstat (limited to 'otautil')
| -rw-r--r-- | otautil/include/otautil/sysutil.h | 4 | ||||
| -rw-r--r-- | otautil/sysutil.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/otautil/include/otautil/sysutil.h b/otautil/include/otautil/sysutil.h index 326db8644..48e9011e5 100644 --- a/otautil/include/otautil/sysutil.h +++ b/otautil/include/otautil/sysutil.h @@ -102,11 +102,11 @@ class MemMapping { }; // Reboots the device into the specified target, by additionally handling quiescent reboot mode. -// All unknown targets reboot into Android. +// 'target' can be an empty string, which indicates booting into Android. bool Reboot(std::string_view target); // Triggers a shutdown. -bool Shutdown(std::string_view target); +bool Shutdown(); // Returns a null-terminated char* array, where the elements point to the C-strings in the given // vector, plus an additional nullptr at the end. This is a helper function that facilitates diff --git a/otautil/sysutil.cpp b/otautil/sysutil.cpp index a8829858d..420db4cac 100644 --- a/otautil/sysutil.cpp +++ b/otautil/sysutil.cpp @@ -229,9 +229,9 @@ bool Reboot(std::string_view target) { return android::base::SetProperty(ANDROID_RB_PROPERTY, cmd); } -bool Shutdown(std::string_view target) { - std::string cmd = "shutdown," + std::string(target); - return android::base::SetProperty(ANDROID_RB_PROPERTY, cmd); +bool Shutdown() { + // "shutdown" doesn't need a "reason" arg nor a comma. + return android::base::SetProperty(ANDROID_RB_PROPERTY, "shutdown"); } std::vector<char*> StringVectorToNullTerminatedArray(const std::vector<std::string>& args) { |