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/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1127,7 +1127,7 @@ public final class SystemServer {
                false);
        boolean enableLeftyService = SystemProperties.getBoolean("config.enable_lefty", false);

-        boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1");
+        boolean isEmulator = SystemProperties.get("ro.boot.qemu").equals("1");

        boolean isWatch = context.getPackageManager().hasSystemFeature(
                PackageManager.FEATURE_WATCH);