Merge "adb: don't spew to logcat when tracing is enabled." (28c44863) · Commits · e / os / android_system_core

adb/adb_trace.cpp

+10 −2

Original line number	Diff line number	Diff line
		@@ -42,7 +42,11 @@ void AdbLogger(android::base::LogId id, android::base::LogSeverity severity,
		const char* message) {
		android::base::StderrLogger(id, severity, tag, file, line, message);
		#if !ADB_HOST
		// Only print logs of INFO or higher to logcat, so that `adb logcat` with adbd tracing on
		// doesn't result in exponential logging.
		if (severity >= android::base::INFO) {
		gLogdLogger(id, severity, tag, file, line, message);
		}
		#endif
		}

		@@ -137,11 +141,15 @@ static void setup_trace_mask() {
		// -1 is used for the special values "1" and "all" that enable all
		// tracing.
		adb_trace_mask = ~0;
		return;
		break;
		} else {
		adb_trace_mask \|= 1 << flag->second;
		}
		}

		if (adb_trace_mask != 0) {
		android::base::SetMinimumLogSeverity(android::base::VERBOSE);
		}
		}

		void adb_trace_init(char** argv) {

+4 −4

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ enum AdbTrace {
		if (LIKELY(!VLOG_IS_ON(TAG))) \
		; \
		else \
		LOG(INFO)
		LOG(DEBUG)

		// You must define TRACE_TAG before using this macro.
		#define D(...) \