aboutsummaryrefslogtreecommitdiffstats
path: root/emulator
diff options
context:
space:
mode:
authorkeunyoung <keunyoung@google.com>2013-03-28 17:25:50 -0700
committerkeunyoung <keunyoung@google.com>2013-03-28 17:25:50 -0700
commite21a341cd5c66f8faaa2c9a93282cdad7ac0261e (patch)
treecb8b69298fe4f0294cdffba85cbcffdeb9678ca1 /emulator
parent125cc1943795916d8e154964b1c16f249056d031 (diff)
downloadsdk-e21a341cd5c66f8faaa2c9a93282cdad7ac0261e.zip
sdk-e21a341cd5c66f8faaa2c9a93282cdad7ac0261e.tar.gz
sdk-e21a341cd5c66f8faaa2c9a93282cdad7ac0261e.tar.bz2
prevent dead-lock by removing mutex lock in errorHandlerProc
- setting int should be OK even without lock as there is no synchronization in reader side - dead-lock can happen inside constructor if the same error handler is already set and if error happens inside constructor in place like XSync Change-Id: I2f401067e0555ae092df23f57cc9ab054a1555d7
Diffstat (limited to 'emulator')
-rw-r--r--emulator/opengl/host/libs/Translator/EGL/EglX11Api.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/emulator/opengl/host/libs/Translator/EGL/EglX11Api.cpp b/emulator/opengl/host/libs/Translator/EGL/EglX11Api.cpp
index c362210..129f244 100644
--- a/emulator/opengl/host/libs/Translator/EGL/EglX11Api.cpp
+++ b/emulator/opengl/host/libs/Translator/EGL/EglX11Api.cpp
@@ -66,7 +66,6 @@ ErrorHandler::~ErrorHandler(){
}
int ErrorHandler::errorHandlerProc(EGLNativeDisplayType dpy,XErrorEvent* event){
- android::Mutex::Autolock mutex(s_lock);
s_lastErrorCode = event->error_code;
return 0;
}