Merge "Add error check when init RS thread in sync mode."

2 files changed, 17 insertions, 8 deletions

diff --git a/cpp/RenderScript.cpp b/cpp/RenderScript.cpp
index 5709f799..d05e4cd2 100644
--- a/cpp/RenderScript.cpp
+++ b/cpp/RenderScript.cpp
@@ -58,15 +58,19 @@ RS::~RS() {
     if (mInit == true) {
         mMessageRun = false;
 
-        RS::dispatch->ContextDeinitToClient(mContext);
+        if (mContext) {
+            RS::dispatch->ContextDeinitToClient(mContext);
 
-        void *res = NULL;
-        int status = pthread_join(mMessageThreadId, &res);
+            void *res = NULL;
+            int status = pthread_join(mMessageThreadId, &res);
 
-        RS::dispatch->ContextDestroy(mContext);
-        mContext = NULL;
-        RS::dispatch->DeviceDestroy(mDev);
-        mDev = NULL;
+            RS::dispatch->ContextDestroy(mContext);
+            mContext = NULL;
+        }
+        if (mDev) {
+            RS::dispatch->DeviceDestroy(mDev);
+            mDev = NULL;
+        }
     }
 }
 
diff --git a/rsContext.cpp b/rsContext.cpp
index 290a0909..878daa11 100644
--- a/rsContext.cpp
+++ b/rsContext.cpp
@@ -580,6 +580,11 @@ bool Context::initContext(Device *dev, const RsSurfaceConfig *sc) {
     timerSet(RS_TIMER_INTERNAL);
     if (mSynchronous) {
         threadProc(this);
+
+        if (mError != RS_ERROR_NONE) {
+            ALOGE("Errors during thread init (sync mode)");
+            return false;
+        }
     } else {
         status = pthread_create(&mThreadId, &threadAttr, threadProc, this);
         if (status) {
@@ -613,7 +618,7 @@ Context::~Context() {
         }
         rsAssert(mExit);
 
-        if (mHal.funcs.shutdownDriver) {
+        if (mHal.funcs.shutdownDriver && mHal.drv) {
             mHal.funcs.shutdownDriver(this);
         }