Snap for 11784291 from fe5d250e33 to 24Q3-release

Change-Id: Ieabd97970f091b35c709f17cc4d2e49d99299250
This commit is contained in:
Android Build Coastguard Worker 2024-04-30 23:01:30 +00:00
commit 9c8c1835ca
2 changed files with 7 additions and 3 deletions

View file

@ -106,7 +106,7 @@ class MemMapping {
[[noreturn]] void Reboot(std::string_view target);
// Triggers a shutdown.
bool Shutdown(std::string_view target);
[[noreturn]] void 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

View file

@ -233,9 +233,13 @@ void Reboot(std::string_view target) {
while (true) pause();
}
bool Shutdown(std::string_view target) {
void Shutdown(std::string_view target) {
std::string cmd = "shutdown," + std::string(target);
return android::base::SetProperty(ANDROID_RB_PROPERTY, cmd);
if (!android::base::SetProperty(ANDROID_RB_PROPERTY, cmd)) {
LOG(FATAL) << "Shutdown failed";
}
while (true) pause();
}
std::vector<char*> StringVectorToNullTerminatedArray(const std::vector<std::string>& args) {