commit 72587b9fb73b85d67090f0b476596c01ff3fae2b
author Christopher Tate <ctate@google.com> Tue Dec 14 10:32:05 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 14 10:32:05 2010 -0800
tree 9352b42604e36859861d70ccaf6bea0599e0911a
parent bc08f3782e9c51e9332ad30104ceb875174c8685
parent 5b57dd64935773eb5cfcc8f19db76b3ec9a6b819

Merge "Time out orphaned / unresponsive restore sessions"

include/binder/IPCThreadState.h

diff --git a/include/binder/IPCThreadState.h b/include/binder/IPCThreadState.h
index b54718f..3378d97 100644
--- a/include/binder/IPCThreadState.h
+++ b/include/binder/IPCThreadState.h
@@ -33,6 +33,7 @@
 {
 public:
     static  IPCThreadState*     self();
+    static  IPCThreadState*     selfOrNull();  // self(), but won't instantiate
     
             sp<ProcessState>    process();
             

libs/binder/IPCThreadState.cpp

diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp
index 13c58f0..95cfddf 100644
--- a/libs/binder/IPCThreadState.cpp
+++ b/libs/binder/IPCThreadState.cpp
@@ -318,6 +318,16 @@
     goto restart;
 }
 
+IPCThreadState* IPCThreadState::selfOrNull()
+{
+    if (gHaveTLS) {
+        const pthread_key_t k = gTLS;
+        IPCThreadState* st = (IPCThreadState*)pthread_getspecific(k);
+        return st;
+    }
+    return NULL;
+}
+
 void IPCThreadState::shutdown()
 {
     gShutdown = true;