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

Commit 2f45ab60 authored by Roman Kiryanov's avatar Roman Kiryanov Committed by Automerger Merge Worker
Browse files

Merge "Populate only emulator specific properties into `ro.kernel.`" am:... 

Merge "Populate only emulator specific properties into `ro.kernel.`" am: 7787e704 am: 7cf1c09c am: 917c6e0d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic5cadcc08201136e3918acd073e85ef752f875f5
parents 2a2de564 917c6e0d

init/property_service.cpp

+3 −11
Original line number Diff line number Diff line
@@ -1166,21 +1166,13 @@ 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_PREFIX)) {

        if (StartsWith(key, ANDROIDBOOT_PREFIX)) {

            InitPropertySet("ro.boot." + key.substr(ANDROIDBOOT_PREFIX.size()), value);

        }

    });



    if (for_emulator) {

        ImportKernelCmdline([&](const std::string& key, const std::string& value) {

            // In the emulator, export any kernel option with the "ro.kernel." prefix.

        } else if (StartsWith(key, "qemu."sv) || (key == "qemu")) {

            InitPropertySet("ro.kernel." + key, value);

        });

        }

    });

}



static void ProcessBootconfig() {