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

Commit 1a705d49 authored by Roman Kiryanov's avatar Roman Kiryanov
Browse files

Populate only emulator specific properties into `ro.kernel.` 



`ro.kernel.` is an emulator specific prefix.

Bug: 182291166
Test: presubmit
Signed-off-by: default avatarRoman Kiryanov <rkir@google.com>
Change-Id: Ie4a19127f05f3074ccb02bd055711e9b70702ba6
parent ccc15c5d

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