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

Commit dcf230ce authored by Mitchell Wills's avatar Mitchell Wills Committed by Automerger Merge Worker
Browse files

Merge "Fix the return values of DmTable::valid to match the expected type" am: dab6a32b 

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



Change-Id: I7f42dcbdabbfadc6519b9e22645dce3bb5da9247
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cdc6de41 dab6a32b

fs_mgr/libdm/dm_table.cpp

+2 −2
Original line number Diff line number Diff line
@@ -38,11 +38,11 @@ bool DmTable::RemoveTarget(std::unique_ptr<DmTarget>&& /* target */) { 
bool DmTable::valid() const {

    if (targets_.empty()) {

        LOG(ERROR) << "Device-mapper table must have at least one target.";

        return "";

        return false;

    }

    if (targets_[0]->start() != 0) {

        LOG(ERROR) << "Device-mapper table must start at logical sector 0.";

        return "";

        return false;

    }

    return true;

}