summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-09-21 15:52:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-21 15:52:09 -0700
commit4ec134cdba52b663506562c6406b07915820b007 (patch)
treef6effbe756140b7b925c2246d842a26bd7689fb8 /include
parent0b2affe8f05f887fcb6ae6314e2a0e586dabe9e1 (diff)
parentcce0cd138dd0dc338db59083052aca01a51bd52d (diff)
downloadframeworks_base-4ec134cdba52b663506562c6406b07915820b007.zip
frameworks_base-4ec134cdba52b663506562c6406b07915820b007.tar.gz
frameworks_base-4ec134cdba52b663506562c6406b07915820b007.tar.bz2
am cce0cd13: Merge "Looper: use pthread_once for TLS key initialization." into gingerbread
Merge commit 'cce0cd138dd0dc338db59083052aca01a51bd52d' into gingerbread-plus-aosp * commit 'cce0cd138dd0dc338db59083052aca01a51bd52d': Looper: use pthread_once for TLS key initialization.
Diffstat (limited to 'include')
-rw-r--r--include/utils/Looper.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/utils/Looper.h b/include/utils/Looper.h
index 7d90866..3f00b78 100644
--- a/include/utils/Looper.h
+++ b/include/utils/Looper.h
@@ -205,6 +205,7 @@ private:
int pollInner(int timeoutMillis);
+ static void initTLSKey();
static void threadDestructor(void *st);
};