summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2011-01-30 16:07:25 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-30 16:07:25 -0800
commit8a2f3ecc030512b6813ee2bb8c56b77280cad7c5 (patch)
tree9e5bb6a90025591a4746853af939d696e05b3789
parenta30063d80c08434ac3c7316f338c6d54110449ab (diff)
parent25503f1c9f0b5f718052b71dc5b21d1c8576d015 (diff)
downloadframeworks_base-8a2f3ecc030512b6813ee2bb8c56b77280cad7c5.zip
frameworks_base-8a2f3ecc030512b6813ee2bb8c56b77280cad7c5.tar.gz
frameworks_base-8a2f3ecc030512b6813ee2bb8c56b77280cad7c5.tar.bz2
am 25503f1c: Merge from gingerbread
* commit '25503f1c9f0b5f718052b71dc5b21d1c8576d015': fix failing thread object run
-rw-r--r--libs/utils/Threads.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/utils/Threads.cpp b/libs/utils/Threads.cpp
index f6c55e4..0b360f4 100644
--- a/libs/utils/Threads.cpp
+++ b/libs/utils/Threads.cpp
@@ -775,6 +775,7 @@ int Thread::_threadLoop(void* user)
self->mLock.lock();
self->mRunning = false;
self->mThreadExitedCondition.broadcast();
+ self->mThread = thread_id_t(-1); // thread id could be reused
self->mLock.unlock();
break;
}