Merge "Revert "Trace Redaction - Reject invalid traces"" into main

google · May 24, 2024 · eec08b8 · eec08b8
2 parents c760fc9 + 5ac566e
commit eec08b8
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 155 deletions.
diff --git a/Android.bp b/Android.bp
@@ -13589,7 +13589,6 @@ filegroup {
         "src/trace_redaction/suspend_resume.cc",
         "src/trace_redaction/trace_redaction_framework.cc",
         "src/trace_redaction/trace_redactor.cc",
-        "src/trace_redaction/verify_integrity.cc",
     ],
 }
 

diff --git a/src/trace_redaction/BUILD.gn b/src/trace_redaction/BUILD.gn
@@ -81,8 +81,6 @@ source_set("trace_redaction") {
     "trace_redaction_framework.h",
     "trace_redactor.cc",
     "trace_redactor.h",
-    "verify_integrity.cc",
-    "verify_integrity.h",
   ]
   deps = [
     "../../gn:default_deps",

diff --git a/src/trace_redaction/main.cc b/src/trace_redaction/main.cc
@@ -39,7 +39,6 @@
 #include "src/trace_redaction/suspend_resume.h"
 #include "src/trace_redaction/trace_redaction_framework.h"
 #include "src/trace_redaction/trace_redactor.h"
-#include "src/trace_redaction/verify_integrity.h"
 
 namespace perfetto::trace_redaction {
 
@@ -49,12 +48,6 @@ static base::Status Main(std::string_view input,
                          std::string_view package_name) {
   TraceRedactor redactor;
 
-  // VerifyIntegrity breaks the CollectPrimitive pattern. Instead of writing to
-  // the context, its job is to read trace packets and return errors if any
-  // packet does not look "correct". This primitive is added first in an effort
-  // to detect and react to bad input before other collectors run.
-  redactor.emplace_collect<VerifyIntegrity>();
-
   // Add all collectors.
   redactor.emplace_collect<FindPackageUid>();
   redactor.emplace_collect<CollectTimelineEvents>();

diff --git a/src/trace_redaction/verify_integrity.cc b/src/trace_redaction/verify_integrity.cc
diff --git a/src/trace_redaction/verify_integrity.h b/src/trace_redaction/verify_integrity.h