From 5b3b373a4938b8359bb55c62057fc5771e689add Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Mon, 22 Feb 2016 17:33:14 -0800
Subject: uncrypt: Retire pre-recovery service.

The framework CL in [1] removes the use of "pre-recovery" service which
is basically to trigger a reboot into the recovery.

[1] commit e8a403d57c8ea540f8287cdaee8b90f0cf9626a3

Bug: 26830925
Change-Id: I131f31a228df59e4f9c3024b238bbdee0be2b157
---
 uncrypt/uncrypt.cpp | 14 +-------------
 uncrypt/uncrypt.rc  |  7 +------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp
index 705744eb6..2a32108a3 100644
--- a/uncrypt/uncrypt.cpp
+++ b/uncrypt/uncrypt.cpp
@@ -406,15 +406,6 @@ static int write_bootloader_message(const bootloader_message* in) {
     return 0;
 }
 
-static void reboot_to_recovery() {
-    ALOGI("rebooting to recovery");
-    property_set("sys.powerctl", "reboot,recovery");
-    while (true) {
-      pause();
-    }
-    ALOGE("reboot didn't succeed?");
-}
-
 static int uncrypt(const char* input_path, const char* map_file, int status_fd) {
 
     ALOGI("update package is \"%s\"", input_path);
@@ -543,7 +534,6 @@ static int read_bcb() {
 static void usage(const char* exename) {
     fprintf(stderr, "Usage of %s:\n", exename);
     fprintf(stderr, "%s [<package_path> <map_file>]  Uncrypt ota package.\n", exename);
-    fprintf(stderr, "%s --reboot  Clear BCB data and reboot to recovery.\n", exename);
     fprintf(stderr, "%s --clear-bcb  Clear BCB data in misc partition.\n", exename);
     fprintf(stderr, "%s --setup-bcb  Setup BCB data by command file.\n", exename);
     fprintf(stderr, "%s --read-bcb   Read BCB data from misc partition.\n", exename);
@@ -551,9 +541,7 @@ static void usage(const char* exename) {
 
 int main(int argc, char** argv) {
     if (argc == 2) {
-        if (strcmp(argv[1], "--reboot") == 0) {
-            reboot_to_recovery();
-        } else if (strcmp(argv[1], "--clear-bcb") == 0) {
+        if (strcmp(argv[1], "--clear-bcb") == 0) {
             return clear_bcb(STATUS_FILE);
         } else if (strcmp(argv[1], "--setup-bcb") == 0) {
             return setup_bcb(COMMAND_FILE, STATUS_FILE);
diff --git a/uncrypt/uncrypt.rc b/uncrypt/uncrypt.rc
index b07c1dada..d5d803b9f 100644
--- a/uncrypt/uncrypt.rc
+++ b/uncrypt/uncrypt.rc
@@ -3,11 +3,6 @@ service uncrypt /system/bin/uncrypt
     disabled
     oneshot
 
-service pre-recovery /system/bin/uncrypt --reboot
-    class main
-    disabled
-    oneshot
-
 service setup-bcb /system/bin/uncrypt --setup-bcb
     class main
     disabled
@@ -16,4 +11,4 @@ service setup-bcb /system/bin/uncrypt --setup-bcb
 service clear-bcb /system/bin/uncrypt --clear-bcb
     class main
     disabled
-    oneshot
\ No newline at end of file
+    oneshot
-- 
cgit v1.2.3