commit fd8def1fac68a2c6559882eab51568caf40214d0
author Andreas Gampe <agampe@google.com> Mon Feb 01 22:32:34 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 01 22:32:34 2016 +0000
tree 385d8b110998bda565c11c242f1d34f1c3280a83
parent 4eb92f53a5f354c6d9d802f43d1188e04f9253c6
parent d654172039817ecdf37268030b4b900f1c94a2dc

Merge "Binder: Add log output in IPCThreadState::self()" am: 2be113a248 am: e7ae3b1962
am: 35cadd735a

* commit '35cadd735aa3db14e82e7d492f7f7d64357e915a':
  Binder: Add log output in IPCThreadState::self()

IPCThreadState.cpp

diff --git a/IPCThreadState.cpp b/IPCThreadState.cpp
index a237684..1f6bda2 100644
--- a/IPCThreadState.cpp
+++ b/IPCThreadState.cpp
@@ -287,12 +287,18 @@
         return new IPCThreadState;
     }
     
-    if (gShutdown) return NULL;
+    if (gShutdown) {
+        ALOGW("Calling IPCThreadState::self() during shutdown is dangerous, expect a crash.\n");
+        return NULL;
+    }
     
     pthread_mutex_lock(&gTLSMutex);
     if (!gHaveTLS) {
-        if (pthread_key_create(&gTLS, threadDestructor) != 0) {
+        int key_create_value = pthread_key_create(&gTLS, threadDestructor);
+        if (key_create_value != 0) {
             pthread_mutex_unlock(&gTLSMutex);
+            ALOGW("IPCThreadState::self() unable to create TLS key, expect a crash: %s\n",
+                    strerror(key_create_value));
             return NULL;
         }
         gHaveTLS = true;