Merge "Load files in proto directory from bugreport" into udc-dev am: 2c724568d3

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/23660822

Change-Id: I1385782924607036c33859d79abc2d807192f736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 18 insertions, 6 deletions

diff --git a/tools/winscope/src/app/trace_pipeline.ts b/tools/winscope/src/app/trace_pipeline.ts
index e1432c860..2621eec5e 100644
--- a/tools/winscope/src/app/trace_pipeline.ts
+++ b/tools/winscope/src/app/trace_pipeline.ts
@@ -130,9 +130,13 @@ class TracePipeline {
       return files;
     }
 
-    const BUGREPORT_TRACE_DIRS = ['FS/data/misc/wmtrace/', 'FS/data/misc/perfetto-traces/'];
-    const isFileWithinBugreportTraceDir = (file: TraceFile) => {
-      for (const traceDir of BUGREPORT_TRACE_DIRS) {
+    const BUGREPORT_FILES_ALLOWLIST = [
+      'FS/data/misc/wmtrace/',
+      'FS/data/misc/perfetto-traces/',
+      'proto/window_CRITICAL.proto',
+    ];
+    const isFileAllowlisted = (file: TraceFile) => {
+      for (const traceDir of BUGREPORT_FILES_ALLOWLIST) {
         if (file.file.name.startsWith(traceDir)) {
           return true;
         }
@@ -144,7 +148,7 @@ class TracePipeline {
       file.parentArchive === bugreportMainEntry.parentArchive;
 
     return files.filter((file) => {
-      return isFileWithinBugreportTraceDir(file) || !fileBelongsToBugreport(file);
+      return isFileAllowlisted(file) || !fileBelongsToBugreport(file);
     });
   }
 
diff --git a/tools/winscope/src/app/trace_pipeline_test.ts b/tools/winscope/src/app/trace_pipeline_test.ts
index 46c670177..67be7221b 100644
--- a/tools/winscope/src/app/trace_pipeline_test.ts
+++ b/tools/winscope/src/app/trace_pipeline_test.ts
@@ -76,7 +76,14 @@ describe('TracePipeline', () => {
       new TraceFile(
         await UnitTestUtils.getFixtureFile(
           'traces/elapsed_and_real_timestamp/WindowManager.pb',
-          'FS/data/misc/ignored-dir/window_manager.bp'
+          'proto/window_CRITICAL.proto'
+        ),
+        bugreportArchive
+      ),
+      new TraceFile(
+        await UnitTestUtils.getFixtureFile(
+          'traces/elapsed_and_real_timestamp/wm_transition_trace.pb',
+          'FS/data/misc/ignored-dir/wm_transition_trace.bp'
         ),
         bugreportArchive
       ),
@@ -103,8 +110,9 @@ describe('TracePipeline', () => {
 
     expect(traces.getTrace(TraceType.SURFACE_FLINGER)).toBeDefined();
     expect(traces.getTrace(TraceType.TRANSACTIONS)).toBeDefined();
-    expect(traces.getTrace(TraceType.WINDOW_MANAGER)).toBeUndefined(); // ignored
+    expect(traces.getTrace(TraceType.WM_TRANSITION)).toBeUndefined(); // ignored
     expect(traces.getTrace(TraceType.INPUT_METHOD_CLIENTS)).toBeDefined();
+    expect(traces.getTrace(TraceType.WINDOW_MANAGER)).toBeDefined();
   });
 
   it('is robust to invalid trace files', async () => {