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

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

Merge "Added some error logs to wipe" am: 719caca7 am: 58d9dd70 am:... 

Merge "Added some error logs to wipe" am: 719caca7 am: 58d9dd70 am: 454eb2a7 am: 0c697640 am: 921ecf40

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



Change-Id: I72ce83f146c73b7985928fe11a84e3dac034d21d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3ab77307 921ecf40

fastboot/task.cpp

+5 −1
Original line number Original line Diff line number Diff line
@@ -201,9 +201,13 @@ WipeTask::WipeTask(FlashingPlan* fp, const std::string& pname) : fp_(fp), pname_ 
void WipeTask::Run() {

void WipeTask::Run() {

    std::string partition_type;

    std::string partition_type;

    if (fp_->fb->GetVar("partition-type:" + pname_, &partition_type) != fastboot::SUCCESS) {

    if (fp_->fb->GetVar("partition-type:" + pname_, &partition_type) != fastboot::SUCCESS) {

        LOG(ERROR) << "wipe task partition not found: " << pname_;

        return;

        return;

    }

    }

    if (partition_type.empty()) return;

    if (partition_type.empty()) return;

    fp_->fb->Erase(pname_);

    if (fp_->fb->Erase(pname_) != fastboot::SUCCESS) {

        LOG(ERROR) << "wipe task erase failed with partition: " << pname_;

        return;

    }

    fb_perform_format(pname_, 1, partition_type, "", fp_->fs_options);

    fb_perform_format(pname_, 1, partition_type, "", fp_->fs_options);

}
 
}