am d31b0e44: am 3bbb5e9a: Merge change Ib7a6c434 into eclair

Merge commit 'd31b0e44af38594691440ba1ab5150b1a8f8480b' into eclair-mr2-plus-aosp

* commit 'd31b0e44af38594691440ba1ab5150b1a8f8480b':
  Fix some leaks.  This fixes the major malloc memory leak in allApps.  Still tracking some much more minor issues.

1 files changed, 3 insertions, 0 deletions

diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp
index eb388af50034..961ec0b2709c 100644
--- a/libs/rs/rsContext.cpp
+++ b/libs/rs/rsContext.cpp
@@ -350,6 +350,7 @@ void * Context::threadProc(void *vrsc)
      rsc->deinitEGL();
      pthread_mutex_unlock(&gInitMutex);
 
+     rsc->mObjDestroy.mNeedToEmpty = true;
      rsc->objDestroyOOBRun();
      LOGV("RS Thread exited");
      return NULL;
@@ -421,6 +422,7 @@ Context::~Context()
 
     mIO.shutdown();
     int status = pthread_join(mThreadId, &res);
+    mObjDestroy.mNeedToEmpty = true;
     objDestroyOOBRun();
 
     // Global structure cleanup.
@@ -431,6 +433,7 @@ Context::~Context()
         if (!gThreadTLSKeyCount) {
             pthread_key_delete(gThreadTLSKey);
         }
+        mDev = NULL;
     }
     pthread_mutex_unlock(&gInitMutex);