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

Commit 942ceeb6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not populate `ro.kernel.qemu` in `ProcessKernelCmdline`" am:... 

Merge "Do not populate `ro.kernel.qemu` in `ProcessKernelCmdline`" am: e37b6f4f am: fddb2e3b am: 5189edc2

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

Change-Id: I58dc487de0ce1d3da041c58e3e6f41f77fa403ef
parents 716ac207 5189edc2

init/property_service.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1172,7 +1172,8 @@ static void ProcessKernelCmdline() { 
        } else if (StartsWith(key, "qemu."sv)) {

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

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

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

            // emulator specific, should be retired once emulator migrates to

            // androidboot.

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

        }

    });