summaryrefslogtreecommitdiffstats
path: root/uncrypt
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-02-28 19:46:29 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-02-28 19:46:29 +0100
commitbc11dd8b7c675ff21ca505d9d67154f04d2862a9 (patch)
treeba7727ee20aa55b19388c55f26004cf16fb24dd1 /uncrypt
parentMerge "Move dumpkey tool to the recovery repo." am: 5197fde242 (diff)
parentMerge "uncrypt: Retire pre-recovery service." into nyc-dev (diff)
downloadandroid_bootable_recovery-bc11dd8b7c675ff21ca505d9d67154f04d2862a9.tar
android_bootable_recovery-bc11dd8b7c675ff21ca505d9d67154f04d2862a9.tar.gz
android_bootable_recovery-bc11dd8b7c675ff21ca505d9d67154f04d2862a9.tar.bz2
android_bootable_recovery-bc11dd8b7c675ff21ca505d9d67154f04d2862a9.tar.lz
android_bootable_recovery-bc11dd8b7c675ff21ca505d9d67154f04d2862a9.tar.xz
android_bootable_recovery-bc11dd8b7c675ff21ca505d9d67154f04d2862a9.tar.zst
android_bootable_recovery-bc11dd8b7c675ff21ca505d9d67154f04d2862a9.zip
Diffstat (limited to 'uncrypt')
-rw-r--r--uncrypt/uncrypt.cpp14
-rw-r--r--uncrypt/uncrypt.rc7
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