diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-16 17:17:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-16 17:17:20 +0000 |
| commit | de535f6eb27b453d0cd0ff78751ddfd4a06fb7b3 (patch) | |
| tree | ae6024c5ae5c5d94596c0f6b152b3cb0f7ed9dfe /services/java/com/android/server/SystemServer.java | |
| parent | 14865c4e0757988f3baeb82fead8187060c17a37 (diff) | |
| parent | 4ba8fde9baa6c0fcb00395922cfbf9dee78b86ac (diff) | |
Merge "Use `ro.boot.qemu` to check if the device is an emulator" am: 62d82e0b33 am: 4ba8fde9ba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625662
Change-Id: I039b17ca0bf956ee3d86c72edcbf81957938ae4b
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -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 7bde760191b5..f710f7cde471 100644 --- 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); |