commit ccc15c5dbd1097b1e6007caab4dca7d4d940c51d
author Roman Kiryanov <rkir@google.com> Tue Mar 09 13:20:36 2021 -0800
committer Roman Kiryanov <rkir@google.com> Thu Mar 11 16:46:00 2021 -0800
tree cc1238560e962d2e35a76fc18195a305cc6279d0
parent 394a1ede40bf35a7d0068c9cb790eee27534047d

Move the `androidboot.` literal into its own variable

Bug: 182291166
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I19f25671c82fff34dd52e3557361c4340706aab0

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index 404a99c..7b7e919 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -44,6 +44,7 @@
 #include <mutex>
 #include <optional>
 #include <queue>
+#include <string_view>
 #include <thread>
 #include <vector>
 
@@ -1162,13 +1163,15 @@
     }
 }
 
+constexpr auto ANDROIDBOOT_PREFIX = "androidboot."sv;
+
 static void ProcessKernelCmdline() {
     bool for_emulator = false;
     ImportKernelCmdline([&](const std::string& key, const std::string& value) {
         if (key == "qemu") {
             for_emulator = true;
-        } else if (StartsWith(key, "androidboot.")) {
-            InitPropertySet("ro.boot." + key.substr(12), value);
+        } else if (StartsWith(key, ANDROIDBOOT_PREFIX)) {
+            InitPropertySet("ro.boot." + key.substr(ANDROIDBOOT_PREFIX.size()), value);
         }
     });
 
@@ -1182,8 +1185,8 @@
 
 static void ProcessBootconfig() {
     ImportBootconfig([&](const std::string& key, const std::string& value) {
-        if (StartsWith(key, "androidboot.")) {
-            InitPropertySet("ro.boot." + key.substr(12), value);
+        if (StartsWith(key, ANDROIDBOOT_PREFIX)) {
+            InitPropertySet("ro.boot." + key.substr(ANDROIDBOOT_PREFIX.size()), value);
         } else if (key == "hardware") {
             // "hardware" in bootconfig replaces "androidboot.hardware" kernel
             // cmdline parameter