ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Change-Id: I81e13920f2b7c60cbe7220df40e7c42d001da9a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Daniel Zheng 2023-04-26 18:32:48 +00:00 • committed by Automerger Merge Worker
commit a065351047
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fastboot/task.cpp
View file

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