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

Commit b6d7ea15 authored by Tianjie Xu's avatar Tianjie Xu
Browse files

Handle the reboot in the recovery user mode 

We have switched to "/system/bin/reboot" to perform the reboot. But
accessing the shell for user build under recovery is not allowed by
sepolicy. So adding a special routine to handle this reboot case.

Bug: 141247819
Test: run `adb reboot` in user mode recovery
Change-Id: Ia37438e52c67fd2bd54e923a0fea5817a1455a08
parent a8f30816

adb/daemon/services.cpp

+22 −3
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <android-base/stringprintf.h>

#include <android-base/strings.h>

#include <android-base/unique_fd.h>

#include <cutils/android_reboot.h>

#include <cutils/sockets.h>

#include <log/log_properties.h>
@@ -140,6 +141,26 @@ static void spin_service(unique_fd fd) { 
    WriteFdExactly(fd.get(), "spinning\n");

}



[[maybe_unused]] static unique_fd reboot_device(const std::string& name) {

#if defined(__ANDROID_RECOVERY__)

    if (!__android_log_is_debuggable()) {

        auto reboot_service = [name](unique_fd fd) {

            std::string reboot_string = android::base::StringPrintf("reboot,%s", name.c_str());

            if (!android::base::SetProperty(ANDROID_RB_PROPERTY, reboot_string)) {

                WriteFdFmt(fd.get(), "reboot (%s) failed\n", reboot_string.c_str());

                return;

            }

            while (true) pause();

        };

        return create_service_thread("reboot", reboot_service);

    }

#endif

    // Fall through

    std::string cmd = "/system/bin/reboot ";

    cmd += name;

    return StartSubprocess(cmd, nullptr, SubprocessType::kRaw, SubprocessProtocol::kNone);

}



struct ServiceSocket : public asocket {

    ServiceSocket() {

        install_local_socket(this);
@@ -252,9 +273,7 @@ unique_fd daemon_service_to_fd(std::string_view name, atransport* transport) { 
        cmd += name;

        return StartSubprocess(cmd, nullptr, SubprocessType::kRaw, SubprocessProtocol::kNone);

    } else if (android::base::ConsumePrefix(&name, "reboot:")) {

        std::string cmd = "/system/bin/reboot ";

        cmd += name;

        return StartSubprocess(cmd, nullptr, SubprocessType::kRaw, SubprocessProtocol::kNone);

        return reboot_device(std::string(name));

    } else if (name.starts_with("root:")) {

        return create_service_thread("root", restart_root_service);

    } else if (name.starts_with("unroot:")) {