resolved conflicts for merge of e4ec1e94 to lmp-dev-plus-aosp (165e4d22) · Commits · e / os / android_system_core

logd/LogTimes.cpp

+1 −5

Original line number	Diff line number	Diff line
		@@ -119,8 +119,7 @@ void LogTimeEntry::threadStart(void obj) {
		SocketClient *client = me->mClient;
		if (!client) {
		me->error();
		pthread_exit(NULL);
		// NOTREACH
		return NULL;
		}

		LogBuffer &logbuf = me->mReader.logbuf();
		@@ -154,9 +153,6 @@ void LogTimeEntry::threadStart(void obj) {

		unlock();

		pthread_exit(NULL);

		// NOTREACH
		pthread_cleanup_pop(true);

		return NULL;