commit 165e4d220202ed386e5b7ebf3a6bde0d335eb227
author Mark Salyzyn <salyzyn@google.com> Tue Aug 12 13:28:08 2014 -0700
committer Mark Salyzyn <salyzyn@google.com> Tue Aug 12 13:28:08 2014 -0700
tree d1f581c15aee8ce5e9af6d94021fe02b23bb1d05
parent d1d0e2bcca941530d9f4e389d2b1aad2c0fd115d
parent e4ec1e94ed38eab5c0fdb964182f8ea9b8939750

resolved conflicts for merge of e4ec1e94 to lmp-dev-plus-aosp

Change-Id: Iec97b6a1cb7c29073bf9d1ae37d8600ff2ae9a8b

logd/LogTimes.cpp

diff --git a/logd/LogTimes.cpp b/logd/LogTimes.cpp
index c6dc174..ea4e8c8 100644
--- a/logd/LogTimes.cpp
+++ b/logd/LogTimes.cpp
@@ -119,8 +119,7 @@
     SocketClient *client = me->mClient;
     if (!client) {
         me->error();
-        pthread_exit(NULL);
-        // NOTREACH
+        return NULL;
     }
 
     LogBuffer &logbuf = me->mReader.logbuf();
@@ -154,9 +153,6 @@
 
     unlock();
 
-    pthread_exit(NULL);
-
-    // NOTREACH
     pthread_cleanup_pop(true);
 
     return NULL;