From e21a341cd5c66f8faaa2c9a93282cdad7ac0261e Mon Sep 17 00:00:00 2001 From: keunyoung Date: Thu, 28 Mar 2013 17:25:50 -0700 Subject: 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 --- emulator/opengl/host/libs/Translator/EGL/EglX11Api.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'emulator/opengl/host') diff --git a/emulator/opengl/host/libs/Translator/EGL/EglX11Api.cpp b/emulator/opengl/host/libs/Translator/EGL/EglX11Api.cpp index c362210b5..129f24454 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; } -- cgit v1.2.3