| commit | d7daa060c5d7f2ab68a8a34c4e5796d7c6672e6e | [log] [tgz] |
|---|---|---|
| author | Kean Mariotti <keanmariotti@google.com> | Thu May 25 13:19:41 2023 +0000 |
| committer | Kean Mariotti <keanmariotti@google.com> | Fri Sep 01 12:25:34 2023 +0000 |
| tree | 49fde321d2193b6ed49e050c83fb5da12e1b62c7 | |
| parent | b20601f8e606684f52ecd5aa169e2930e31353e8 [diff] |
Revert^2 Convert SurfaceFlinger traces to perfetto format Test: tested in the following CLs with new parsers for perfetto traces Bug: b/284424740 Change-Id: Ie077f842f5de8376413d4ebe49bb827ad0840063
diff --git a/libraries/flicker/test/assets/testdata/layers_trace.winscope b/libraries/flicker/test/assets/testdata/layers_trace.perfetto-trace similarity index 87% rename from libraries/flicker/test/assets/testdata/layers_trace.winscope rename to libraries/flicker/test/assets/testdata/layers_trace.perfetto-trace index b13b316..4129673 100644 --- a/libraries/flicker/test/assets/testdata/layers_trace.winscope +++ b/libraries/flicker/test/assets/testdata/layers_trace.perfetto-trace Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/layers_trace_emptyregion.pb b/libraries/flicker/test/assets/testdata/layers_trace_emptyregion.perfetto-trace similarity index 90% rename from libraries/flicker/test/assets/testdata/layers_trace_emptyregion.pb rename to libraries/flicker/test/assets/testdata/layers_trace_emptyregion.perfetto-trace index 3df8cc7..d9aca8a 100644 --- a/libraries/flicker/test/assets/testdata/layers_trace_emptyregion.pb +++ b/libraries/flicker/test/assets/testdata/layers_trace_emptyregion.perfetto-trace Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/layers_trace_invalid_layer_visibility.pb b/libraries/flicker/test/assets/testdata/layers_trace_invalid_layer_visibility.perfetto-trace similarity index 65% rename from libraries/flicker/test/assets/testdata/layers_trace_invalid_layer_visibility.pb rename to libraries/flicker/test/assets/testdata/layers_trace_invalid_layer_visibility.perfetto-trace index 20572d7..76fd242 100644 --- a/libraries/flicker/test/assets/testdata/layers_trace_invalid_layer_visibility.pb +++ b/libraries/flicker/test/assets/testdata/layers_trace_invalid_layer_visibility.perfetto-trace Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/layers_trace_invalid_visible_layers.pb b/libraries/flicker/test/assets/testdata/layers_trace_invalid_visible_layers.perfetto-trace similarity index 95% rename from libraries/flicker/test/assets/testdata/layers_trace_invalid_visible_layers.pb rename to libraries/flicker/test/assets/testdata/layers_trace_invalid_visible_layers.perfetto-trace index b35c1b5..7b54b8b 100644 --- a/libraries/flicker/test/assets/testdata/layers_trace_invalid_visible_layers.pb +++ b/libraries/flicker/test/assets/testdata/layers_trace_invalid_visible_layers.perfetto-trace Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/layers_trace_launch_split_screen.pb b/libraries/flicker/test/assets/testdata/layers_trace_launch_split_screen.perfetto-trace similarity index 95% rename from libraries/flicker/test/assets/testdata/layers_trace_launch_split_screen.pb rename to libraries/flicker/test/assets/testdata/layers_trace_launch_split_screen.perfetto-trace index f64374a..3fd4c99 100644 --- a/libraries/flicker/test/assets/testdata/layers_trace_launch_split_screen.pb +++ b/libraries/flicker/test/assets/testdata/layers_trace_launch_split_screen.perfetto-trace Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/layers_trace_occluded.pb b/libraries/flicker/test/assets/testdata/layers_trace_occluded.perfetto-trace similarity index 96% rename from libraries/flicker/test/assets/testdata/layers_trace_occluded.pb rename to libraries/flicker/test/assets/testdata/layers_trace_occluded.perfetto-trace index 0c1693c..8a352e4 100644 --- a/libraries/flicker/test/assets/testdata/layers_trace_occluded.pb +++ b/libraries/flicker/test/assets/testdata/layers_trace_occluded.perfetto-trace Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/layers_trace_openchrome.pb b/libraries/flicker/test/assets/testdata/layers_trace_openchrome.perfetto-trace similarity index 90% rename from libraries/flicker/test/assets/testdata/layers_trace_openchrome.pb rename to libraries/flicker/test/assets/testdata/layers_trace_openchrome.perfetto-trace index ba58762..ce09d31 100644 --- a/libraries/flicker/test/assets/testdata/layers_trace_openchrome.pb +++ b/libraries/flicker/test/assets/testdata/layers_trace_openchrome.perfetto-trace Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/layers_trace_pip_wmshell.pb b/libraries/flicker/test/assets/testdata/layers_trace_pip_wmshell.perfetto-trace similarity index 89% rename from libraries/flicker/test/assets/testdata/layers_trace_pip_wmshell.pb rename to libraries/flicker/test/assets/testdata/layers_trace_pip_wmshell.perfetto-trace index 71e3f47..26c73c2 100644 --- a/libraries/flicker/test/assets/testdata/layers_trace_pip_wmshell.pb +++ b/libraries/flicker/test/assets/testdata/layers_trace_pip_wmshell.perfetto-trace Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/layers_trace_root.pb b/libraries/flicker/test/assets/testdata/layers_trace_root.perfetto-trace similarity index 76% rename from libraries/flicker/test/assets/testdata/layers_trace_root.pb rename to libraries/flicker/test/assets/testdata/layers_trace_root.perfetto-trace index d961714..68d1efa 100644 --- a/libraries/flicker/test/assets/testdata/layers_trace_root.pb +++ b/libraries/flicker/test/assets/testdata/layers_trace_root.perfetto-trace Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/layers_trace_root_aosp.pb b/libraries/flicker/test/assets/testdata/layers_trace_root_aosp.perfetto-trace similarity index 88% rename from libraries/flicker/test/assets/testdata/layers_trace_root_aosp.pb rename to libraries/flicker/test/assets/testdata/layers_trace_root_aosp.perfetto-trace index 666b328..81d5667 100644 --- a/libraries/flicker/test/assets/testdata/layers_trace_root_aosp.pb +++ b/libraries/flicker/test/assets/testdata/layers_trace_root_aosp.perfetto-trace Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/layers_trace_rounded_corners.winscope b/libraries/flicker/test/assets/testdata/layers_trace_rounded_corners.perfetto-trace similarity index 87% rename from libraries/flicker/test/assets/testdata/layers_trace_rounded_corners.winscope rename to libraries/flicker/test/assets/testdata/layers_trace_rounded_corners.perfetto-trace index 9e592b8..d6a4502 100644 --- a/libraries/flicker/test/assets/testdata/layers_trace_rounded_corners.winscope +++ b/libraries/flicker/test/assets/testdata/layers_trace_rounded_corners.perfetto-trace Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/layers_trace_snapshotStartingWindowLayerCoversExactlyApp.winscope b/libraries/flicker/test/assets/testdata/layers_trace_snapshotStartingWindowLayerCoversExactlyApp.perfetto-trace similarity index 99% rename from libraries/flicker/test/assets/testdata/layers_trace_snapshotStartingWindowLayerCoversExactlyApp.winscope rename to libraries/flicker/test/assets/testdata/layers_trace_snapshotStartingWindowLayerCoversExactlyApp.perfetto-trace index d9c577d..82a7af3 100644 --- a/libraries/flicker/test/assets/testdata/layers_trace_snapshotStartingWindowLayerCoversExactlyApp.winscope +++ b/libraries/flicker/test/assets/testdata/layers_trace_snapshotStartingWindowLayerCoversExactlyApp.perfetto-trace Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/layers_trace_snapshot_visible.pb b/libraries/flicker/test/assets/testdata/layers_trace_snapshot_visible.perfetto-trace old mode 100755 new mode 100644 similarity index 96% rename from libraries/flicker/test/assets/testdata/layers_trace_snapshot_visible.pb rename to libraries/flicker/test/assets/testdata/layers_trace_snapshot_visible.perfetto-trace index 923757e..94329fd --- a/libraries/flicker/test/assets/testdata/layers_trace_snapshot_visible.pb +++ b/libraries/flicker/test/assets/testdata/layers_trace_snapshot_visible.perfetto-trace Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/layers_trace_splashscreen.pb b/libraries/flicker/test/assets/testdata/layers_trace_splashscreen.perfetto-trace similarity index 97% rename from libraries/flicker/test/assets/testdata/layers_trace_splashscreen.pb rename to libraries/flicker/test/assets/testdata/layers_trace_splashscreen.perfetto-trace index d4b7f44..3a3b0d1 100644 --- a/libraries/flicker/test/assets/testdata/layers_trace_splashscreen.pb +++ b/libraries/flicker/test/assets/testdata/layers_trace_splashscreen.perfetto-trace Binary files differ
diff --git a/libraries/flicker/utils/test/assets/testdata/layers_trace_unlock_and_lock_device.pb b/libraries/flicker/test/assets/testdata/layers_trace_unlock_and_lock_device.perfetto-trace similarity index 98% copy from libraries/flicker/utils/test/assets/testdata/layers_trace_unlock_and_lock_device.pb copy to libraries/flicker/test/assets/testdata/layers_trace_unlock_and_lock_device.perfetto-trace index 28ac4f4..dc2b804 100644 --- a/libraries/flicker/utils/test/assets/testdata/layers_trace_unlock_and_lock_device.pb +++ b/libraries/flicker/test/assets/testdata/layers_trace_unlock_and_lock_device.perfetto-trace Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/layers_trace_visible_outside_bounds.winscope b/libraries/flicker/test/assets/testdata/layers_trace_visible_outside_bounds.perfetto-trace similarity index 87% rename from libraries/flicker/test/assets/testdata/layers_trace_visible_outside_bounds.winscope rename to libraries/flicker/test/assets/testdata/layers_trace_visible_outside_bounds.perfetto-trace index bc6a1ac..2324b3c 100644 --- a/libraries/flicker/test/assets/testdata/layers_trace_visible_outside_bounds.winscope +++ b/libraries/flicker/test/assets/testdata/layers_trace_visible_outside_bounds.perfetto-trace Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/one_visible_layer_launcher_trace.pb b/libraries/flicker/test/assets/testdata/one_visible_layer_launcher_trace.perfetto-trace old mode 100755 new mode 100644 similarity index 99% rename from libraries/flicker/test/assets/testdata/one_visible_layer_launcher_trace.pb rename to libraries/flicker/test/assets/testdata/one_visible_layer_launcher_trace.perfetto-trace index 86390c7..c8f04f3 --- a/libraries/flicker/test/assets/testdata/one_visible_layer_launcher_trace.pb +++ b/libraries/flicker/test/assets/testdata/one_visible_layer_launcher_trace.perfetto-trace Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/scenarios/AppLaunch/layers_trace.winscope b/libraries/flicker/test/assets/testdata/scenarios/AppLaunch/layers_and_transactions_trace.perfetto-trace similarity index 81% rename from libraries/flicker/test/assets/testdata/scenarios/AppLaunch/layers_trace.winscope rename to libraries/flicker/test/assets/testdata/scenarios/AppLaunch/layers_and_transactions_trace.perfetto-trace index 2dec84a..9ed140b 100644 --- a/libraries/flicker/test/assets/testdata/scenarios/AppLaunch/layers_trace.winscope +++ b/libraries/flicker/test/assets/testdata/scenarios/AppLaunch/layers_and_transactions_trace.perfetto-trace Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/scenarios/AppLaunch/transactions_trace.winscope b/libraries/flicker/test/assets/testdata/scenarios/AppLaunch/transactions_trace.winscope deleted file mode 100644 index 0b41179..0000000 --- a/libraries/flicker/test/assets/testdata/scenarios/AppLaunch/transactions_trace.winscope +++ /dev/null Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/scenarios/DebugScenario/layers_trace.winscope b/libraries/flicker/test/assets/testdata/scenarios/DebugScenario/layers_and_transactions_trace.perfetto-trace similarity index 76% copy from libraries/flicker/test/assets/testdata/scenarios/DebugScenario/layers_trace.winscope copy to libraries/flicker/test/assets/testdata/scenarios/DebugScenario/layers_and_transactions_trace.perfetto-trace index 1cb1df8..ceaefe0 100644 --- a/libraries/flicker/test/assets/testdata/scenarios/DebugScenario/layers_trace.winscope +++ b/libraries/flicker/test/assets/testdata/scenarios/DebugScenario/layers_and_transactions_trace.perfetto-trace Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/scenarios/DebugScenario/layers_trace.winscope b/libraries/flicker/test/assets/testdata/scenarios/DebugScenario/layers_trace.perfetto-trace similarity index 86% rename from libraries/flicker/test/assets/testdata/scenarios/DebugScenario/layers_trace.winscope rename to libraries/flicker/test/assets/testdata/scenarios/DebugScenario/layers_trace.perfetto-trace index 1cb1df8..4540a7a 100644 --- a/libraries/flicker/test/assets/testdata/scenarios/DebugScenario/layers_trace.winscope +++ b/libraries/flicker/test/assets/testdata/scenarios/DebugScenario/layers_trace.perfetto-trace Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/scenarios/DebugScenario/transactions_trace.perfetto-trace b/libraries/flicker/test/assets/testdata/scenarios/DebugScenario/transactions_trace.perfetto-trace new file mode 100644 index 0000000..7e76712 --- /dev/null +++ b/libraries/flicker/test/assets/testdata/scenarios/DebugScenario/transactions_trace.perfetto-trace Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/scenarios/DebugScenario/transactions_trace.winscope b/libraries/flicker/test/assets/testdata/scenarios/DebugScenario/transactions_trace.winscope deleted file mode 100644 index 271686b..0000000 --- a/libraries/flicker/test/assets/testdata/scenarios/DebugScenario/transactions_trace.winscope +++ /dev/null Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/transactions_trace.perfetto-trace b/libraries/flicker/test/assets/testdata/transactions_trace.perfetto-trace new file mode 100644 index 0000000..b302bcd --- /dev/null +++ b/libraries/flicker/test/assets/testdata/transactions_trace.perfetto-trace Binary files differ
diff --git a/libraries/flicker/utils/test/assets/testdata/layers_dump_with_display.pb b/libraries/flicker/utils/test/assets/testdata/layers_dump_with_display.pb deleted file mode 100644 index f5f9975..0000000 --- a/libraries/flicker/utils/test/assets/testdata/layers_dump_with_display.pb +++ /dev/null Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/layers_trace.winscope b/libraries/flicker/utils/test/assets/testdata/layers_trace.perfetto-trace similarity index 87% copy from libraries/flicker/test/assets/testdata/layers_trace.winscope copy to libraries/flicker/utils/test/assets/testdata/layers_trace.perfetto-trace index b13b316..4129673 100644 --- a/libraries/flicker/test/assets/testdata/layers_trace.winscope +++ b/libraries/flicker/utils/test/assets/testdata/layers_trace.perfetto-trace Binary files differ
diff --git a/libraries/flicker/utils/test/assets/testdata/layers_trace.winscope b/libraries/flicker/utils/test/assets/testdata/layers_trace.winscope deleted file mode 100644 index b13b316..0000000 --- a/libraries/flicker/utils/test/assets/testdata/layers_trace.winscope +++ /dev/null Binary files differ
diff --git a/libraries/flicker/utils/test/assets/testdata/layers_trace_backcolorsurface.pb b/libraries/flicker/utils/test/assets/testdata/layers_trace_backcolorsurface.perfetto-trace similarity index 97% rename from libraries/flicker/utils/test/assets/testdata/layers_trace_backcolorsurface.pb rename to libraries/flicker/utils/test/assets/testdata/layers_trace_backcolorsurface.perfetto-trace index d19d33d..6ee89d1 100644 --- a/libraries/flicker/utils/test/assets/testdata/layers_trace_backcolorsurface.pb +++ b/libraries/flicker/utils/test/assets/testdata/layers_trace_backcolorsurface.perfetto-trace Binary files differ
diff --git a/libraries/flicker/utils/test/assets/testdata/layers_trace_empty_state.winscope b/libraries/flicker/utils/test/assets/testdata/layers_trace_empty_state.perfetto-trace similarity index 96% rename from libraries/flicker/utils/test/assets/testdata/layers_trace_empty_state.winscope rename to libraries/flicker/utils/test/assets/testdata/layers_trace_empty_state.perfetto-trace index c26d627..1f0a795 100644 --- a/libraries/flicker/utils/test/assets/testdata/layers_trace_empty_state.winscope +++ b/libraries/flicker/utils/test/assets/testdata/layers_trace_empty_state.perfetto-trace Binary files differ
diff --git a/libraries/flicker/utils/test/assets/testdata/layers_trace_emptyregion.pb b/libraries/flicker/utils/test/assets/testdata/layers_trace_emptyregion.perfetto-trace similarity index 90% rename from libraries/flicker/utils/test/assets/testdata/layers_trace_emptyregion.pb rename to libraries/flicker/utils/test/assets/testdata/layers_trace_emptyregion.perfetto-trace index 3df8cc7..d9aca8a 100644 --- a/libraries/flicker/utils/test/assets/testdata/layers_trace_emptyregion.pb +++ b/libraries/flicker/utils/test/assets/testdata/layers_trace_emptyregion.perfetto-trace Binary files differ
diff --git a/libraries/flicker/utils/test/assets/testdata/layers_trace_launch_split_screen.pb b/libraries/flicker/utils/test/assets/testdata/layers_trace_launch_split_screen.perfetto-trace similarity index 95% rename from libraries/flicker/utils/test/assets/testdata/layers_trace_launch_split_screen.pb rename to libraries/flicker/utils/test/assets/testdata/layers_trace_launch_split_screen.perfetto-trace index f64374a..3fd4c99 100644 --- a/libraries/flicker/utils/test/assets/testdata/layers_trace_launch_split_screen.pb +++ b/libraries/flicker/utils/test/assets/testdata/layers_trace_launch_split_screen.perfetto-trace Binary files differ
diff --git a/libraries/flicker/utils/test/assets/testdata/layers_trace_occluded.pb b/libraries/flicker/utils/test/assets/testdata/layers_trace_occluded.pb deleted file mode 100644 index 0c1693c..0000000 --- a/libraries/flicker/utils/test/assets/testdata/layers_trace_occluded.pb +++ /dev/null Binary files differ
diff --git a/libraries/flicker/utils/test/assets/testdata/layers_trace_orphanlayers.pb b/libraries/flicker/utils/test/assets/testdata/layers_trace_orphanlayers.perfetto-trace similarity index 61% rename from libraries/flicker/utils/test/assets/testdata/layers_trace_orphanlayers.pb rename to libraries/flicker/utils/test/assets/testdata/layers_trace_orphanlayers.perfetto-trace index af40797..e1dce84 100644 --- a/libraries/flicker/utils/test/assets/testdata/layers_trace_orphanlayers.pb +++ b/libraries/flicker/utils/test/assets/testdata/layers_trace_orphanlayers.perfetto-trace Binary files differ
diff --git a/libraries/flicker/utils/test/assets/testdata/layers_trace_root.pb b/libraries/flicker/utils/test/assets/testdata/layers_trace_root.pb deleted file mode 100644 index d961714..0000000 --- a/libraries/flicker/utils/test/assets/testdata/layers_trace_root.pb +++ /dev/null Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/layers_trace_root.pb b/libraries/flicker/utils/test/assets/testdata/layers_trace_root.perfetto-trace similarity index 76% copy from libraries/flicker/test/assets/testdata/layers_trace_root.pb copy to libraries/flicker/utils/test/assets/testdata/layers_trace_root.perfetto-trace index d961714..68d1efa 100644 --- a/libraries/flicker/test/assets/testdata/layers_trace_root.pb +++ b/libraries/flicker/utils/test/assets/testdata/layers_trace_root.perfetto-trace Binary files differ
diff --git a/libraries/flicker/utils/test/assets/testdata/layers_trace_root_aosp.pb b/libraries/flicker/utils/test/assets/testdata/layers_trace_root_aosp.pb deleted file mode 100644 index 666b328..0000000 --- a/libraries/flicker/utils/test/assets/testdata/layers_trace_root_aosp.pb +++ /dev/null Binary files differ
diff --git a/libraries/flicker/test/assets/testdata/layers_trace_root_aosp.pb b/libraries/flicker/utils/test/assets/testdata/layers_trace_root_aosp.perfetto-trace similarity index 88% copy from libraries/flicker/test/assets/testdata/layers_trace_root_aosp.pb copy to libraries/flicker/utils/test/assets/testdata/layers_trace_root_aosp.perfetto-trace index 666b328..81d5667 100644 --- a/libraries/flicker/test/assets/testdata/layers_trace_root_aosp.pb +++ b/libraries/flicker/utils/test/assets/testdata/layers_trace_root_aosp.perfetto-trace Binary files differ
diff --git a/libraries/flicker/utils/test/assets/testdata/layers_trace_unlock_and_lock_device.pb b/libraries/flicker/utils/test/assets/testdata/layers_trace_unlock_and_lock_device.perfetto-trace similarity index 99% rename from libraries/flicker/utils/test/assets/testdata/layers_trace_unlock_and_lock_device.pb rename to libraries/flicker/utils/test/assets/testdata/layers_trace_unlock_and_lock_device.perfetto-trace index 28ac4f4..dc2b804 100644 --- a/libraries/flicker/utils/test/assets/testdata/layers_trace_unlock_and_lock_device.pb +++ b/libraries/flicker/utils/test/assets/testdata/layers_trace_unlock_and_lock_device.perfetto-trace Binary files differ
diff --git a/libraries/flicker/utils/test/assets/testdata/transactions_trace.perfetto-trace b/libraries/flicker/utils/test/assets/testdata/transactions_trace.perfetto-trace new file mode 100644 index 0000000..b302bcd --- /dev/null +++ b/libraries/flicker/utils/test/assets/testdata/transactions_trace.perfetto-trace Binary files differ
diff --git a/libraries/flicker/utils/test/assets/testdata/transactions_trace.winscope b/libraries/flicker/utils/test/assets/testdata/transactions_trace.winscope deleted file mode 100644 index 8c268b5..0000000 --- a/libraries/flicker/utils/test/assets/testdata/transactions_trace.winscope +++ /dev/null Binary files differ