summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Bo Hu <bohu@google.com> 2016-02-23 21:46:31 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-02-23 21:46:33 +0000
commit4dc580c0dfb33a515bc71353a06398b3ddafe4dc (patch)
tree76b7b5f856afa9af24b2ddcb0098dc78da3d2f5f
parent934b91db10957e0e3b69a2ea6cc4c0ed0a27fb15 (diff)
parentb73396b3f89de9620ab6e3d37b25f7451584789c (diff)
Merge "Emulator: Replace ro.kernel.qemu.gles with qemu.gles" into nyc-dev
-rw-r--r--core/jni/android_view_DisplayListCanvas.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_view_DisplayListCanvas.cpp b/core/jni/android_view_DisplayListCanvas.cpp
index 03c94a683ec2..c87a7701786c 100644
--- a/core/jni/android_view_DisplayListCanvas.cpp
+++ b/core/jni/android_view_DisplayListCanvas.cpp
@@ -160,7 +160,7 @@ static jboolean android_view_DisplayListCanvas_isAvailable(JNIEnv* env, jobject
}
// In the emulator this property will be set > 0 when OpenGL ES 2.0 is
// enabled, 0 otherwise. On old emulator versions it will be undefined.
- property_get("ro.kernel.qemu.gles", prop, "0");
+ property_get("qemu.gles", prop, "0");
return atoi(prop) > 0 ? JNI_TRUE : JNI_FALSE;
}