tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Pause recovery when it ends with Shutdown" into main am: 75014b82e2 am: 6dee61bf56

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/3030423

Change-Id: I4b8b86c97167526ddfbd0b10b6ee719a325a15c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-04-30 17:50:40 +00:00 committed by Automerger Merge Worker
commit fe5d250e33
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
otautil/include/otautil/sysutil.h
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

8
otautil/sysutil.cpp
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) {