Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base

libs/utils/Threads.cpp

@@ -799,6 +799,9 @@ void Thread::requestExit()
 
 status_t Thread::requestExitAndWait()
 {
+    // hold a reference so mThreadExitedCondition is not destroyed before wait() returns
+    sp<Thread> strong(mHoldSelf);
+
     if (mThread == getThreadId()) {
         LOGW(
         "Thread (this=%p): don't call waitForExit() from this "