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

Commit 49340ac4 authored by Roman Kiryanov's avatar Roman Kiryanov Committed by Automerger Merge Worker
Browse files

Merge "Move the `androidboot.` literal into its own variable" am: a3d37ac9 am: 8c1cd62d 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id13a33cde54c052ac6442b00f945391ab102d7f0
parents 616a23a9 8c1cd62d

init/property_service.cpp

+7 −4
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include <mutex>

#include <optional>

#include <queue>

#include <string_view>

#include <thread>

#include <vector>
@@ -1162,13 +1163,15 @@ static void ProcessKernelDt() { 
    }

}



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 ProcessKernelCmdline() { 


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