commit 2ee9a92f6a941f010d8f85cd8baee708cd6f2e16
author Nick Pelly <npelly@google.com> Wed Jan 12 16:28:59 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 12 16:28:59 2011 -0800
tree c290a7025e0ba45e9b6f29b09d2e0260343fe440
parent 9c9f15acb5c009c1d6adafcc0b280ce4afc1feec
parent e9bef148d2f82bcb42d1a53731bd8c8de71cc083

Merge "New Intent defined for RF ON/OFF events" into gingerbread

libs/utils/Threads.cpp

diff --git a/libs/utils/Threads.cpp b/libs/utils/Threads.cpp
index f6c55e4..ad9a94f 100644
--- a/libs/utils/Threads.cpp
+++ b/libs/utils/Threads.cpp
@@ -774,6 +774,9 @@
             self->mExitPending = true;
             self->mLock.lock();
             self->mRunning = false;
+            // clear thread ID so that requestExitAndWait() does not exit if
+            // called by a new thread using the same thread ID as this one.
+            self->mThread = thread_id_t(-1);
             self->mThreadExitedCondition.broadcast();
             self->mLock.unlock();
             break;