commit b4bbf8878c3a6b2a17a3a96f1a23300748dbd81a
author Doug Zongker <dougz@google.com> Tue Mar 18 10:56:32 2014 -0700
committer Doug Zongker <dougz@google.com> Tue Mar 18 10:56:32 2014 -0700
tree eb94c2b19dd8b6af5cdae489f825d78a05430bfb
parent 47c7e365071f75489604b2d0ba3109fe39bac1ef
parent 708aa23801b0bc8349ab017c92c0deaf9d767c52

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

Change-Id: I3d00437d519f93652ccae6b361e89e853ccae9b3

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index 8d4ce97..8f2183d 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -57,6 +57,7 @@
   { "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 @@
     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 @@
             }
             break;
         }
+        case 'p': shutdown_after = true; break;
         case '?':
             LOGE("Invalid command argument\n");
             continue;
@@ -1079,7 +1080,12 @@
 
     // 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;
 }