resolved conflicts for merge of 3a5f3050 to master (8e4cdc1e) · Commits · e / os / android_system_core

debuggerd/tombstone.cpp

+11 −13

Original line number	Diff line number	Diff line
		@@ -486,7 +486,8 @@ static void dump_log_file(
		break;
		}
		} else if (actual == 0) {
		_LOG(log, 0, "Got zero bytes while reading log: %s\n", strerror(errno));
		_LOG(log, 0, "Got zero bytes while reading log: %s\n",
		strerror(errno));
		break;
		}

		@@ -543,7 +544,6 @@ static void dump_log_file(
		_LOG(log, 0, "%s.%03d %5d %5d %c %-8s: %s\n",
		timeBuf, entry->nsec / 1000000, entry->pid, entry->tid,
		prioChar, tag, msg);

		} while ((msg = nl));
		}

		@@ -630,7 +630,6 @@ static bool dump_crash(log_t* log, pid_t pid, pid_t tid, int signal, uintptr_t a
		}

		if (want_logs) {
		// Dump the last five lines of the logs for the given pid.
		dump_logs(log, pid, 5);
		}

		@@ -643,7 +642,6 @@ static bool dump_crash(log_t* log, pid_t pid, pid_t tid, int signal, uintptr_t a
		delete map;

		if (want_logs) {
		// Dump the logs for the given pid.
		dump_logs(log, pid, 0);
		}