Merge "Fix Lazy layers trace parsing in winscope" into tm-dev

tools/winscope/src/DataInput.vue

@@ -373,9 +373,9 @@ export default {
 
           const selectedFile =
               this.getMostLikelyCandidateFile(dataType, files);
-          const frozenData = Object.freeze(selectedFile.data);
-          delete selectedFile.data;
-          selectedFile.data = frozenData;
+          if (selectedFile.data) {
+            selectedFile.data = Object.freeze(selectedFile.data);
+          }
 
           this.$set(this.dataFiles, dataType, Object.freeze(selectedFile));
 
@@ -592,28 +592,26 @@ export default {
 
       let lastError;
       for (const filename in content.files) {
-        if (content.files.hasOwnProperty(filename)) {
-          const file = content.files[filename];
-          if (file.dir) {
-            // Ignore directories
-            continue;
+        const file = content.files[filename];
+        if (file.dir) {
+          // Ignore directories
+          continue;
+        }
+
+        const fileBlob = await file.async('blob');
+        // Get only filename and remove rest of path
+        fileBlob.name = filename.split('/').slice(-1).pop();
+
+        try {
+          const decodedFile = await this.decodeFile(fileBlob);
+
+          decodedFiles.push(decodedFile);
+        } catch (e) {
+          if (!(e instanceof UndetectableFileType)) {
+            lastError = e;
           }
 
-          const fileBlob = await file.async('blob');
-          // Get only filename and remove rest of path
-          fileBlob.name = filename.split('/').slice(-1).pop();
-
-          try {
-            const decodedFile = await this.decodeFile(fileBlob);
-
-            decodedFiles.push(decodedFile);
-          } catch (e) {
-            if (!(e instanceof UndetectableFileType)) {
-              lastError = e;
-            }
-
-            console.error(e);
-          }
+          console.error(e);
         }
       }
 

tools/winscope/src/flickerlib/common.js

@@ -56,8 +56,8 @@ const WindowToken = require('flicker').com.android.server.wm.traces.common.
 // SF
 const Layer = require('flicker').com.android.server.wm.traces.common.
     layers.Layer;
-const AbstractLayerTraceEntry = require('flicker').com.android.server.wm.traces.common.
-    layers.AbstractLayerTraceEntry;
+const BaseLayerTraceEntry = require('flicker').com.android.server.wm.traces.common.
+    layers.BaseLayerTraceEntry;
 const LayerTraceEntry = require('flicker').com.android.server.wm.traces.common.
     layers.LayerTraceEntry;
 const LayerTraceEntryBuilder = require('flicker').com.android.server.wm.traces.
@@ -272,7 +272,7 @@ export {
   WindowManagerTrace,
   WindowManagerState,
   // SF
-  AbstractLayerTraceEntry,
+  BaseLayerTraceEntry,
   Layer,
   LayerTraceEntry,
   LayerTraceEntryBuilder,

tools/winscope/src/flickerlib/layers/LayerTraceEntryLazy.ts

@@ -15,10 +15,10 @@
  */
 
 
-import { AbstractLayerTraceEntry } from "../common";
+import { BaseLayerTraceEntry } from "../common";
 import LayerTraceEntry from "./LayerTraceEntry";
 
-class LayerTraceEntryLazy extends AbstractLayerTraceEntry {
+class LayerTraceEntryLazy extends BaseLayerTraceEntry {
   private _isInitialized: boolean = false;
   private _layersProto: any[];
   private _displayProtos: any[];