summaryrefslogtreecommitdiffstats
path: root/otautil
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2019-05-20 19:36:16 +0200
committerMark Salyzyn <salyzyn@google.com>2019-05-20 22:52:10 +0200
commit6f4e4db4f9e0911a07c6393d01e4380e844f7891 (patch)
treec39c8c28b494d05bb4bcaf0ca4d8e6dff2a3cc95 /otautil
parentDO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master (diff)
downloadandroid_bootable_recovery-6f4e4db4f9e0911a07c6393d01e4380e844f7891.tar
android_bootable_recovery-6f4e4db4f9e0911a07c6393d01e4380e844f7891.tar.gz
android_bootable_recovery-6f4e4db4f9e0911a07c6393d01e4380e844f7891.tar.bz2
android_bootable_recovery-6f4e4db4f9e0911a07c6393d01e4380e844f7891.tar.lz
android_bootable_recovery-6f4e4db4f9e0911a07c6393d01e4380e844f7891.tar.xz
android_bootable_recovery-6f4e4db4f9e0911a07c6393d01e4380e844f7891.tar.zst
android_bootable_recovery-6f4e4db4f9e0911a07c6393d01e4380e844f7891.zip
Diffstat (limited to 'otautil')
-rw-r--r--otautil/include/otautil/sysutil.h4
-rw-r--r--otautil/sysutil.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/otautil/include/otautil/sysutil.h b/otautil/include/otautil/sysutil.h
index 48e9011e5..326db8644 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.
-// 'target' can be an empty string, which indicates booting into Android.
+// All unknown targets reboot into Android.
bool Reboot(std::string_view target);
// Triggers a shutdown.
-bool Shutdown();
+bool Shutdown(std::string_view target);
// 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 420db4cac..a8829858d 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() {
- // "shutdown" doesn't need a "reason" arg nor a comma.
- return android::base::SetProperty(ANDROID_RB_PROPERTY, "shutdown");
+bool Shutdown(std::string_view target) {
+ std::string cmd = "shutdown," + std::string(target);
+ return android::base::SetProperty(ANDROID_RB_PROPERTY, cmd);
}
std::vector<char*> StringVectorToNullTerminatedArray(const std::vector<std::string>& args) {