diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/Config.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/Config.kt index 332be0f88..199833feb 100644 --- a/app/core/src/main/java/com/topjohnwu/magisk/core/Config.kt +++ b/app/core/src/main/java/com/topjohnwu/magisk/core/Config.kt @@ -128,7 +128,7 @@ object Config : PreferenceConfig, DBConfig { LocaleSetting.instance.setLocale(value) } - var zygisk by dbSettings(Key.ZYGISK, false) + var zygisk by dbSettings(Key.ZYGISK, Info.isEmulator) var suManager by dbStrings(Key.SU_MANAGER, "", true) var keyStoreRaw by dbStrings(Key.KEYSTORE, "", true) diff --git a/native/src/core/daemon.rs b/native/src/core/daemon.rs index 5c0ef2b0f..bfb0f5e20 100644 --- a/native/src/core/daemon.rs +++ b/native/src/core/daemon.rs @@ -99,11 +99,9 @@ impl MagiskD { } pub fn daemon_entry() { - let mut qemu = get_prop(cstr!("ro.kernel.qemu"), false); - if qemu.is_empty() { - qemu = get_prop(cstr!("ro.boot.qemu"), false); - } - let is_emulator = qemu == "1"; + let is_emulator = get_prop(cstr!("ro.kernel.qemu"), false) == "1" + || get_prop(cstr!("ro.boot.qemu"), false) == "1" + || get_prop(cstr!("ro.product.device"), false).contains("vsoc"); // Load config status let mut buf = Utf8CStrBufArr::<64>::new();