Merge "Revert^2 "Fix check for whether a trace tag is enabled"" into main (9c831a6b) · Commits · e / os / android_frameworks_native

libs/tracing_perfetto/include/tracing_perfetto.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ Result traceInstantForTrack(uint64_t category, const char* trackName,

		Result traceCounter(uint64_t category, const char* name, int64_t value);

		uint64_t getEnabledCategories();
		bool isTagEnabled(uint64_t category);

		} // namespace tracing_perfetto

+6 −5

Original line number	Diff line number	Diff line
		@@ -130,12 +130,13 @@ Result traceCounter(uint64_t category, const char* name, int64_t value) {
		}
		}

		uint64_t getEnabledCategories() {
		if (internal::isPerfettoRegistered()) {
		// TODO(b/303199244): Return only enabled categories and not all registered ones
		return internal::getDefaultCategories();
		bool isTagEnabled(uint64_t category) {
		struct PerfettoTeCategory* perfettoTeCategory =
		internal::toPerfettoCategory(category);
		if (perfettoTeCategory != nullptr) {
		return true;
		} else {
		return atrace_get_enabled_tags();
		return (atrace_get_enabled_tags() & category) != 0;
		}
		}