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

uncrypt: Retire pre-recovery service.

Browse Source 
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
This commit is contained in:
Tao Bao
2016-02-22 17:33:14 -08:00
parent e1305768f6
commit 5b3b373a49
2 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
uncrypt/uncrypt.cpp
View File

@@ -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);