commit bcba6f666e43c9af8d7f28e581f1cf4badb0dcdf
author Sangkyu Lee <sk82.lee@lge.com> Tue Apr 01 15:22:13 2014 +0900
committer Sangkyu Lee <sk82.lee@lge.com> Wed Apr 02 08:07:31 2014 +0900
tree 066aa6aae30fbd9060835058da4eaa227543d6d3
parent 87026027be429b673a8158594d16156345e66829

Fix potential deadlock caused by RenderScript

If the context is created with RS_CONTEXT_SYNCHRONOUS flag,
there is no thread to join.

Unfortunately, deadlock can occur if mThreadId has a
joinable thread ID since mThreadId is uninitialized.

Change-Id: I0315237a41d3ca33f0aa691c7de1ae29d2c02b57

rsContext.cpp

diff --git a/rsContext.cpp b/rsContext.cpp
index 916c6a0..290a090 100644
--- a/rsContext.cpp
+++ b/rsContext.cpp
@@ -608,7 +608,9 @@
         void *res;
 
         mIO.shutdown();
-        int status = pthread_join(mThreadId, &res);
+        if (!mSynchronous) {
+            pthread_join(mThreadId, &res);
+        }
         rsAssert(mExit);
 
         if (mHal.funcs.shutdownDriver) {