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

Commit 09a2326f authored by Roman Kiryanov's avatar Roman Kiryanov Committed by Automerger Merge Worker
Browse files

Merge "Populate `ro.boot.qemu` for the emulator device" am: dce1f88b am:... 

Merge "Populate `ro.boot.qemu` for the emulator device" am: dce1f88b am: b132468a am: e506d186 am: a69b9930

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3567cb22628033b93a95af38b3ee88b3995710f8
parents f0159548 a69b9930

init/property_service.cpp

+4 −1
Original line number Diff line number Diff line
@@ -1169,8 +1169,11 @@ static void ProcessKernelCmdline() { 
    ImportKernelCmdline([&](const std::string& key, const std::string& value) {

        if (StartsWith(key, ANDROIDBOOT_PREFIX)) {

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

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

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

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

        } else if (key == "qemu") {

            InitPropertySet("ro.kernel." + key, value);  // emulator specific, deprecated

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

        }

    });

}