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

Commit a0653510 authored by Daniel Zheng's avatar Daniel Zheng Committed by Automerger Merge Worker
Browse files

Merge "Removing {userspace} from reboot task'" am: ab4723f8 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2553430



Change-Id: I81e13920f2b7c60cbe7220df40e7c42d001da9a6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 22c52f6f ab4723f8

fastboot/task.cpp

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ RebootTask::RebootTask(const FlashingPlan* fp, const std::string& reboot_target) 
    : reboot_target_(reboot_target), fp_(fp){};



void RebootTask::Run() {

    if ((reboot_target_ == "userspace" || reboot_target_ == "fastboot")) {

    if (reboot_target_ == "fastboot") {

        if (!is_userspace_fastboot()) {

            reboot_to_userspace_fastboot();

            fp_->fb->WaitForDisconnect();