Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f272b9e7 authored by Tao Bao's avatar Tao Bao Committed by Gerrit Code Review
Browse files

Merge "Clean up the sleep()'s after poking init services"

parents 73151b51 75238631

recovery.cpp

+11 −8
Original line number Diff line number Diff line
@@ -31,24 +31,24 @@ 
#include <time.h>

#include <unistd.h>



#include <adb.h>

#include <base/file.h>

#include <base/stringprintf.h>

#include <cutils/android_reboot.h>

#include <cutils/properties.h>



#include "adb_install.h"

#include "bootloader.h"

#include "common.h"

#include "cutils/properties.h"

#include "cutils/android_reboot.h"

#include "device.h"

#include "fuse_sdcard_provider.h"

#include "fuse_sideload.h"

#include "install.h"

#include "minui/minui.h"

#include "minzip/DirUtil.h"

#include "roots.h"

#include "ui.h"

#include "screen_ui.h"

#include "device.h"

#include "adb_install.h"

#include "adb.h"

#include "fuse_sideload.h"

#include "fuse_sdcard_provider.h"



struct selabel_handle *sehandle;
@@ -1119,6 +1119,9 @@ main(int argc, char **argv) { 
            property_set(ANDROID_RB_PROPERTY, "reboot,");

            break;

    }

    sleep(5); // should reboot before this finishes

    while (true) {

      pause();

    }

    // Should be unreachable.

    return EXIT_SUCCESS;

}

ui.cpp

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ void RecoveryUI::ProcessKey(int key_code, int updown) { 
          case RecoveryUI::REBOOT:

            if (reboot_enabled) {

                property_set(ANDROID_RB_PROPERTY, "reboot,");

                while(1) { pause(); }

                while (true) { pause(); }

            }

            break;

uncrypt/uncrypt.cpp

+8 −4
Original line number Diff line number Diff line
@@ -40,18 +40,20 @@ 
// file data to use as an update package.



#include <errno.h>

#include <fcntl.h>

#include <linux/fs.h>

#include <stdarg.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <stdarg.h>

#include <sys/types.h>

#include <sys/stat.h>

#include <fcntl.h>

#include <linux/fs.h>

#include <sys/mman.h>

#include <unistd.h>



#define LOG_TAG "uncrypt"

#include <log/log.h>

#include <cutils/android_reboot.h>

#include <cutils/properties.h>

#include <fs_mgr.h>
@@ -376,7 +378,9 @@ static void wipe_misc() { 
static void reboot_to_recovery() {

    ALOGI("rebooting to recovery");

    property_set("sys.powerctl", "reboot,recovery");

    sleep(10);

    while (true) {

      pause();

    }

    ALOGE("reboot didn't succeed?");

}