commit 53ad66f41b18a96d7af3081fbe84646192ffc509
author Devin Moore <devinmoore@google.com> Thu Jul 08 16:06:43 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 08 16:06:43 2021 +0000
tree 7916102ed6744c498079c01ae7c0f78eee34a4e9
parent 905ef0e025ea183077a7b8ca4a5226c9620fd4bf
parent 6d5445b9f487b6466ab67cfb1fad26f612c16784

Merge "init: remove extra space in list of bootconfig values"

init/util.cpp

diff --git a/init/util.cpp b/init/util.cpp
index a40d104..9f7bfdb 100644
--- a/init/util.cpp
+++ b/init/util.cpp
@@ -253,8 +253,10 @@
     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));
         }
     }
 }