Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 035288f9 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Print the checksum of the trace file on failure" am: ef04ccb4 am:... 

Merge "Print the checksum of the trace file on failure" am: ef04ccb4 am: 895568cf am: 2db43c52 am: cf0c1a33

Change-Id: Ic907efaff0c84917458a0224216e4bd2e0fecaa4
parents f2de14de cf0c1a33

tests/FlickerTests/src/com/android/server/wm/flicker/FlickerTestBase.java

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ public class FlickerTestBase { 
                        }

                        if (result.screenCaptureVideoExists()) {

                            Log.e(TAG, "Screen capture video saved to " + result

                                    .screenCaptureVideo.toString());

                                    .screenCaptureVideoPath().toString());

                        }

                    }

                });

tests/FlickerTests/src/com/android/server/wm/flicker/ResizeSplitScreenTest.java

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ public class ResizeSplitScreenTest extends NonRotationTestBase { 
        Rect displayBounds = getDisplayBounds();

        checkResults(result -> {

            LayersTrace entries = LayersTrace.parseFrom(result.getLayersTrace(),

                    result.getLayersTracePath());

                    result.getLayersTracePath(), result.getLayersTraceChecksum());



            assertThat(entries.getEntries()).isNotEmpty();

            Rect startingDividerBounds = entries.getEntries().get(0).getVisibleBounds
@@ -124,7 +124,7 @@ public class ResizeSplitScreenTest extends NonRotationTestBase { 
        Rect displayBounds = getDisplayBounds();

        checkResults(result -> {

            LayersTrace entries = LayersTrace.parseFrom(result.getLayersTrace(),

                    result.getLayersTracePath());

                    result.getLayersTracePath(), result.getLayersTraceChecksum());



            assertThat(entries.getEntries()).isNotEmpty();

            Rect endingDividerBounds = entries.getEntries().get(