summaryrefslogtreecommitdiff
path: root/libs/hwui/Properties.cpp
diff options
context:
space:
mode:
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
commit83a6070d1238dee10c7af0472a873f542f0b52ef (patch)
tree93907d028cae161b9307d94cff32d70831285440 /libs/hwui/Properties.cpp
parentdc8f8d8b6948f7b3a671bf73e9adbd8b529005f4 (diff)
parentde535f6eb27b453d0cd0ff78751ddfd4a06fb7b3 (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 'libs/hwui/Properties.cpp')
-rw-r--r--libs/hwui/Properties.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/Properties.cpp b/libs/hwui/Properties.cpp
index 971a53a8b2dc..e58f31fd15eb 100644
--- a/libs/hwui/Properties.cpp
+++ b/libs/hwui/Properties.cpp
@@ -126,7 +126,7 @@ bool Properties::load() {
SkAndroidFrameworkTraceUtil::setEnableTracing(
base::GetBoolProperty(PROPERTY_SKIA_ATRACE_ENABLED, false));
- runningInEmulator = base::GetBoolProperty(PROPERTY_QEMU_KERNEL, false);
+ runningInEmulator = base::GetBoolProperty(PROPERTY_IS_EMULATOR, false);
return (prevDebugLayersUpdates != debugLayersUpdates) || (prevDebugOverdraw != debugOverdraw);
}