Merge "Use ro.boot.qemu to check if the device is an emulator"

2021-03-16 16:31:57 +00:00
parent f98037abb3 d6a9f42566
commit 62d82e0b33
6 changed files with 7 additions and 7 deletions
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -138,7 +138,7 @@ public class Build {
     */
    @UnsupportedAppUsage
    @TestApi
-    public static final boolean IS_EMULATOR = getString("ro.kernel.qemu").equals("1");
+    public static final boolean IS_EMULATOR = getString("ro.boot.qemu").equals("1");

    /**
     * A hardware serial number, if available. Alphanumeric only, case-insensitive.