Commit 109b0290 authored Mar 23, 2021 by Treehugger Robot Committed by Automerger Merge Worker Mar 23, 2021

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 am: 942ceeb6

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

Change-Id: Ia901d066a4f59c5160f9c0b7aca4ce80f8a18337

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);
		}
		});