diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-17 16:09:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-17 16:09:12 +0000 |
| commit | 83a6070d1238dee10c7af0472a873f542f0b52ef (patch) | |
| tree | 93907d028cae161b9307d94cff32d70831285440 /services/java/com/android/server | |
| parent | dc8f8d8b6948f7b3a671bf73e9adbd8b529005f4 (diff) | |
| parent | de535f6eb27b453d0cd0ff78751ddfd4a06fb7b3 (diff) | |
Merge "Use `ro.boot.qemu` to check if the device is an emulator" am: 62d82e0b33 am: 4ba8fde9ba am: de535f6eb2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625662
Change-Id: Ia613c23fb779697882f9928b15684fb1ff97e9cd
Diffstat (limited to 'services/java/com/android/server')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 4e23609bd774..592952354b8f 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1327,7 +1327,7 @@ public final class SystemServer implements Dumpable { 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); |