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

Commit 821502b8 authored by Tom Cherry's avatar Tom Cherry Committed by Automerger Merge Worker
Browse files

Merge "init: do not create dev.mnt. properties for emulated mounts" am:... 

Merge "init: do not create dev.mnt. properties for emulated mounts" am: 9481c673 am: 6c1a2df7 am: d245f1c6

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

Change-Id: I60168d378609a913a413dd569b72d2aa71b18cc2
parents c971a3db d245f1c6

init/mount_handler.cpp

+5 −1
Original line number Diff line number Diff line
@@ -130,7 +130,11 @@ void MountHandler::MountHandlerFunction() { 
    char* buf = nullptr;

    size_t len = 0;

    while (getline(&buf, &len, fp_.get()) != -1) {

        auto entry = ParseMount(std::string(buf));

        auto buf_string = std::string(buf);

        if (buf_string.find("/emulated") != std::string::npos) {

            continue;

        }

        auto entry = ParseMount(buf_string);

        auto match = untouched.find(entry);

        if (match == untouched.end()) {

            touched.emplace_back(std::move(entry));