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

Commit 0591e5a6 authored by Jiyong Park's avatar Jiyong Park Committed by Automerger Merge Worker
Browse files

Merge "Fixed failure of clearing loopback device" into main am: 7f90296c am: a4cfd205 

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



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

init/reboot.cpp

+7 −2
Original line number Diff line number Diff line
@@ -486,8 +486,7 @@ static Result<void> KillZramBackingDevice() { 
        return ErrnoError() << "Failed to read " << ZRAM_BACK_DEV;

    }



    // cut the last "\n"

    backing_dev.erase(backing_dev.length() - 1);

    android::base::Trim(backing_dev);



    if (android::base::StartsWith(backing_dev, "none")) {

        LOG(INFO) << "No zram backing device configured";
@@ -508,6 +507,12 @@ static Result<void> KillZramBackingDevice() { 
                       << " failed";

    }



    if (!android::base::ReadFileToString(ZRAM_BACK_DEV, &backing_dev)) {

        return ErrnoError() << "Failed to read " << ZRAM_BACK_DEV;

    }



    android::base::Trim(backing_dev);



    if (!android::base::StartsWith(backing_dev, "/dev/block/loop")) {

        LOG(INFO) << backing_dev << " is not a loop device. Exiting early";

        return {};