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

Commit d401f33b authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge "init: remove extra space in list of bootconfig values" am: 53ad66f4... 

Merge "init: remove extra space in list of bootconfig values" am: 53ad66f4 am: 70601315 am: b278c3ab

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

Change-Id: I6fb90b5d21af368b8a9c014cb79180a79c99a684
parents cbae90ad b278c3ab

init/util.cpp

+4 −2
Original line number Diff line number Diff line
@@ -253,8 +253,10 @@ void ImportBootconfig(const std::function<void(const std::string&, const std::st 
    for (const auto& entry : android::base::Split(bootconfig, "\n")) {

        std::vector<std::string> pieces = android::base::Split(entry, "=");

        if (pieces.size() == 2) {

            pieces[1].erase(std::remove(pieces[1].begin(), pieces[1].end(), '"'), pieces[1].end());

            fn(android::base::Trim(pieces[0]), android::base::Trim(pieces[1]));

            // get rid of the extra space between a list of values and remove the quotes.

            std::string value = android::base::StringReplace(pieces[1], "\", \"", ",", true);

            value.erase(std::remove(value.begin(), value.end(), '"'), value.end());

            fn(android::base::Trim(pieces[0]), android::base::Trim(value));

        }

    }

}