From e57556a8afad914363f709a86e5fb843b3644ba2 Mon Sep 17 00:00:00 2001
From: vvb2060 <vvb2060@gmail.com>
Date: Fri, 22 Jan 2021 22:25:29 +0800
Subject: [PATCH] Use ro.kernel.qemu to check emulator

---
 .../java/com/topjohnwu/magisk/core/Info.kt    | 35 +++++--------------
 .../java/com/topjohnwu/magisk/ktx/XAndroid.kt | 10 ++++++
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/core/Info.kt b/app/src/main/java/com/topjohnwu/magisk/core/Info.kt
index ee9b8bf02..ef09975d1 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/Info.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/Info.kt
@@ -1,11 +1,11 @@
 package com.topjohnwu.magisk.core
 
-import android.os.Build
 import androidx.databinding.ObservableBoolean
 import com.topjohnwu.magisk.DynAPK
 import com.topjohnwu.magisk.core.model.UpdateInfo
 import com.topjohnwu.magisk.core.utils.net.NetworkObserver
 import com.topjohnwu.magisk.ktx.get
+import com.topjohnwu.magisk.ktx.getProperty
 import com.topjohnwu.magisk.utils.CachedValue
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.ShellUtils.fastCmd
@@ -30,33 +30,14 @@ object Info {
 
     // Device state
     var crypto = ""
-    @JvmStatic var isSAR = false
-    @JvmStatic var isAB = false
+    @JvmField var isSAR = false
+    @JvmField var isAB = false
     @JvmStatic val isFDE get() = crypto == "block"
-    @JvmStatic var ramdisk = false
-    @JvmStatic var hasGMS = true
-    @JvmStatic var isPixel = false
-    @JvmStatic val cryptoText get() = crypto.capitalize(Locale.US)
-
-    @JvmStatic
-    val isEmulator: Boolean get() {
-        return (Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic")
-            || Build.FINGERPRINT.startsWith("generic")
-            || Build.FINGERPRINT.startsWith("unknown")
-            || Build.HARDWARE.contains("goldfish")
-            || Build.HARDWARE.contains("ranchu")
-            || Build.MODEL.contains("google_sdk")
-            || Build.MODEL.contains("Emulator")
-            || Build.MODEL.contains("Android SDK built for x86")
-            || Build.MANUFACTURER.contains("Genymotion")
-            || Build.PRODUCT.contains("sdk_google")
-            || Build.PRODUCT.contains("google_sdk")
-            || Build.PRODUCT.contains("sdk")
-            || Build.PRODUCT.contains("sdk_x86")
-            || Build.PRODUCT.contains("vbox86p")
-            || Build.PRODUCT.contains("emulator")
-            || Build.PRODUCT.contains("simulator"))
-    }
+    @JvmField var ramdisk = false
+    @JvmField var hasGMS = true
+    @JvmField var isPixel = false
+    @JvmStatic val cryptoText get()= crypto.capitalize(Locale.US)
+    @JvmField val isEmulator = getProperty("ro.kernel.qemu", "0") == "1"
 
     val isConnected by lazy {
         ObservableBoolean(false).also { field ->
diff --git a/app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt b/app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt
index 37adca5cc..d8ba1edec 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt
@@ -369,3 +369,13 @@ fun Int.dpInPx(): Int {
     val scale = AssetHack.resource.displayMetrics.density
     return (this * scale + 0.5).toInt()
 }
+
+@SuppressLint("PrivateApi")
+fun getProperty(key: String, def: String): String {
+    runCatching {
+        val clazz = Class.forName("android.os.SystemProperties")
+        val get = clazz.getMethod("get", String::class.java, String::class.java)
+        return get.invoke(clazz, key, def) as String
+    }
+    return def
+}