PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I3d00437d519f93652ccae6b361e89e853ccae9b3
This commit is contained in:
Doug Zongker
2014-03-18 10:56:32 -07:00
parent 47c7e36507 708aa23801
commit b4bbf8878c
1 changed files with 10 additions and 4 deletions
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' }, { "just_exit", no_argument, NULL, 'x' },
{ "locale", required_argument, NULL, 'l' }, { "locale", required_argument, NULL, 'l' },
{ "stages", required_argument, NULL, 'g' }, { "stages", required_argument, NULL, 'g' },
{ "shutdown_after", no_argument, NULL, 'p' },
{ NULL, 0, NULL, 0 }, { NULL, 0, NULL, 0 },
}; };
@@ -945,16 +946,15 @@ main(int argc, char **argv) {
rotate_last_logs(10); rotate_last_logs(10);
get_args(&argc, &argv); get_args(&argc, &argv);
int previous_runs = 0;
const char *send_intent = NULL; const char *send_intent = NULL;
const char *update_package = NULL; const char *update_package = NULL;
int wipe_data = 0, wipe_cache = 0, show_text = 0; int wipe_data = 0, wipe_cache = 0, show_text = 0;
bool just_exit = false; bool just_exit = false;
bool shutdown_after = false;
int arg; int arg;
while ((arg = getopt_long(argc, argv, "", OPTIONS, NULL)) != -1) { while ((arg = getopt_long(argc, argv, "", OPTIONS, NULL)) != -1) {
switch (arg) { switch (arg) {
case 'p': previous_runs = atoi(optarg); break;
case 's': send_intent = optarg; break; case 's': send_intent = optarg; break;
case 'u': update_package = optarg; break; case 'u': update_package = optarg; break;
case 'w': wipe_data = wipe_cache = 1; break; case 'w': wipe_data = wipe_cache = 1; break;
@@ -970,6 +970,7 @@ main(int argc, char **argv) {
} }
break; break;
} }
case 'p': shutdown_after = true; break;
case '?': case '?':
LOGE("Invalid command argument\n"); LOGE("Invalid command argument\n");
continue; continue;
@@ -1079,7 +1080,12 @@ main(int argc, char **argv) {
// Otherwise, get ready to boot the main system... // Otherwise, get ready to boot the main system...
finish_recovery(send_intent); finish_recovery(send_intent);
ui->Print("Rebooting...\n"); if (shutdown_after) {
property_set(ANDROID_RB_PROPERTY, "reboot,"); 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; return EXIT_SUCCESS;
} }