Merge "Allow SurfaceFlinger_CRITICAL.proto from bugreports" into main

Author: PriyankaSPX

tools/winscope/src/app/trace_file_filter.ts

@@ -31,6 +31,7 @@ export class TraceFileFilter {
     'FS/data/misc/wmtrace/',
     'FS/data/misc/perfetto-traces/',
     'proto/window_CRITICAL.proto',
+    'proto/SurfaceFlinger_CRITICAL.proto',
   ];
 
   async filter(files: TraceFile[], errorListener: WinscopeErrorListener): Promise<FilterResult> {

tools/winscope/src/app/trace_file_filter_test.ts

@@ -44,6 +44,7 @@ describe('TraceFileFilter', () => {
         makeTraceFile('FS/data/misc/wmtrace/surface_flinger.bp', bugreportArchive),
         makeTraceFile('FS/data/misc/wmtrace/transactions.bp', bugreportArchive),
         makeTraceFile('proto/window_CRITICAL.proto', bugreportArchive),
+        makeTraceFile('proto/SurfaceFlinger_CRITICAL.proto', bugreportArchive),
       ];
 
       const ignoredBugreportFile = makeTraceFile(