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

Commit 87b455f5 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 23469 into eclair 

* changes:
  Set a default dump type for DRT as a workaround for indeterministic order in receiving dumpAsText and onPageFinish callback.
parents 0c91f5a3 f3d924ca

tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.dumprendertree;



import com.android.dumprendertree.TestShellActivity.DumpDataType;

import com.android.dumprendertree.forwarder.AdbUtils;

import com.android.dumprendertree.forwarder.ForwardServer;
@@ -399,7 +400,8 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh 
        if (resume)

            resumeTestList();



        TestShellActivity activity = (TestShellActivity) getActivity();

        TestShellActivity activity = getActivity();

        activity.setDefaultDumpDataType(DumpDataType.DUMP_AS_TEXT);



        // Run tests.

        int addr = -1;