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

resolved conflicts for merge of 708aa238 to klp-dev-plus-aosp

Browse source 
Change-Id: Ib1d15be84cec58e23472ef2014d322f3f55c6bb8
This commit is contained in:
Doug Zongker 2014-03-18 10:54:31 -07:00
commit a7d211c6ad
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
recovery.cpp
View file

@ -57,6 +57,7 @@ static const struct option OPTIONS[] = {
{ "just_exit", no_argument, NULL, 'x' },
{ "locale", required_argument, NULL, 'l' },
{ "stages", required_argument, NULL, 'g' },
{ "shutdown_after", no_argument, NULL, 'p' },
{ NULL, 0, NULL, 0 },
};
@ -945,16 +946,15 @@ main(int argc, char **argv) {
rotate_last_logs(10);
get_args(&argc, &argv);
int previous_runs = 0;
const char *send_intent = NULL;
const char *update_package = NULL;
int wipe_data = 0, wipe_cache = 0, show_text = 0;
bool just_exit = false;
bool shutdown_after = false;
int arg;
while ((arg = getopt_long(argc, argv, "", OPTIONS, NULL)) != -1) {
switch (arg) {
case 'p': previous_runs = atoi(optarg); break;
case 's': send_intent = optarg; break;
case 'u': update_package = optarg; break;
case 'w': wipe_data = wipe_cache = 1; break;
@ -970,6 +970,7 @@ main(int argc, char **argv) {
}
break;
}
case 'p': shutdown_after = true; break;
case '?':
LOGE("Invalid command argument\n");
continue;
@ -1079,7 +1080,12 @@ main(int argc, char **argv) {
// Otherwise, get ready to boot the main system...
finish_recovery(send_intent);
ui->Print("Rebooting...\n");
property_set(ANDROID_RB_PROPERTY, "reboot,");
if (shutdown_after) {
ui->Print("Shutting down...\n");
property_set(ANDROID_RB_PROPERTY, "shutdown,");
} else {
ui->Print("Rebooting...\n");
property_set(ANDROID_RB_PROPERTY, "reboot,");
}
return EXIT_SUCCESS;
}