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

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

Merge "adb: Fix the 'adb reboot sideload' for A/B devices."

parents 4bf9c828 40e0ec91

adb/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ LOCAL_STRIP_MODULE := keep_symbols 
LOCAL_STATIC_LIBRARIES := \

    libadbd \

    libbase \

    libbootloader_message \

    libfs_mgr \

    libfec \

    libfec_rs \

adb/services.cpp

+7 −11
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 


#if !ADB_HOST

#include <android-base/properties.h>

#include <bootloader_message/bootloader_message.h>

#include <cutils/android_reboot.h>

#include <private/android_logger.h>

#endif
@@ -133,17 +134,12 @@ static bool reboot_service_impl(int fd, const char* arg) { 
            return false;

        }



        const char* const recovery_dir = "/cache/recovery";

        const char* const command_file = "/cache/recovery/command";

        // Ensure /cache/recovery exists.

        if (adb_mkdir(recovery_dir, 0770) == -1 && errno != EEXIST) {

            D("Failed to create directory '%s': %s", recovery_dir, strerror(errno));

            return false;

        }



        bool write_status = android::base::WriteStringToFile(

                auto_reboot ? "--sideload_auto_reboot" : "--sideload", command_file);

        if (!write_status) {

        const std::vector<std::string> options = {

            auto_reboot ? "--sideload_auto_reboot" : "--sideload"

        };

        std::string err;

        if (!write_bootloader_message(options, &err)) {

            D("Failed to set bootloader message: %s", err.c_str());

            return false;

        }