Revert^2 "Fix check for whether a trace tag is enabled"
83483148c38b18110a4beec5dd554e9beed74ccb
Change-Id: I9e37dbb1e6396a8456c57df68932c96dc289d804
Bug: 330172681
diff --git a/libs/tracing_perfetto/include/tracing_perfetto.h b/libs/tracing_perfetto/include/tracing_perfetto.h
index 4e3c83f..2c1c2a4 100644
--- a/libs/tracing_perfetto/include/tracing_perfetto.h
+++ b/libs/tracing_perfetto/include/tracing_perfetto.h
@@ -46,7 +46,7 @@
Result traceCounter(uint64_t category, const char* name, int64_t value);
-uint64_t getEnabledCategories();
+bool isTagEnabled(uint64_t category);
} // namespace tracing_perfetto
diff --git a/libs/tracing_perfetto/tracing_perfetto.cpp b/libs/tracing_perfetto/tracing_perfetto.cpp
index 19d1eb6..6f716ee 100644
--- a/libs/tracing_perfetto/tracing_perfetto.cpp
+++ b/libs/tracing_perfetto/tracing_perfetto.cpp
@@ -130,12 +130,13 @@
}
}
-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;
}
}