Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83483148 authored by Priyanka Advani's avatar Priyanka Advani Committed by Android (Google) Code Review
Browse files

Revert "Fix check for whether a trace tag is enabled" 

Revert submission 26575765-is_tag_enabled

Reason for revert: Droid-monitored triggered revert due to breakage in b/330172681. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:26575765-is_tag_enabled

Change-Id: I870c6e3edaada40e44ce843cb343619f73b1a42d
parent cd6024fb

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);



bool isTagEnabled(uint64_t category);

uint64_t getEnabledCategories();



}  // namespace tracing_perfetto

libs/tracing_perfetto/tracing_perfetto.cpp

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

}



bool isTagEnabled(uint64_t category) {

  struct PerfettoTeCategory* perfettoTeCategory =

      internal::toPerfettoCategory(category);

  if (perfettoTeCategory != nullptr) {

    return true;

uint64_t getEnabledCategories() {

  if (internal::isPerfettoRegistered()) {

    // TODO(b/303199244): Return only enabled categories and not all registered ones

    return internal::getDefaultCategories();

  } else {

    return (atrace_get_enabled_tags() & category) != 0;

    return atrace_get_enabled_tags();

  }

}