diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-02-13 00:29:07 -0800 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-02-15 00:22:06 +0000 |
| commit | 4cd7227b78773fbd201bee4627b55f4008e961e7 (patch) | |
| tree | 4a79f588318cff97038aa91eaa46469989518867 /opengl/libs/EGL/egl.cpp | |
| parent | be1b7537097779385da94ae98e0cca76732d74ba (diff) | |
| parent | 529cb9ed9c5d62d5b270cdd650380ae116382143 (diff) | |
| download | frameworks_native-4cd7227b78773fbd201bee4627b55f4008e961e7.zip frameworks_native-4cd7227b78773fbd201bee4627b55f4008e961e7.tar.gz frameworks_native-4cd7227b78773fbd201bee4627b55f4008e961e7.tar.bz2 | |
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/native into 1.1
Android 4.2.2 release 1
Conflicts:
libs/ui/GraphicBufferAllocator.cpp
Change-Id: Id60a6580bf5a3ba04f8e1e2b1b950e0b93888166
Diffstat (limited to 'opengl/libs/EGL/egl.cpp')
| -rw-r--r-- | opengl/libs/EGL/egl.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index 96e1cba..0d4bed5 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -124,6 +124,12 @@ void initEglTraceLevel() { void initEglDebugLevel() { int propertyLevel = 0; char value[PROPERTY_VALUE_MAX]; + + // check system property only on userdebug or eng builds + property_get("ro.debuggable", value, "0"); + if (value[0] == '0') + return; + property_get("debug.egl.debug_proc", value, ""); if (strlen(value) > 0) { long pid = getpid(); |