Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 87b455f5: Merge change 23469 into eclair

Browse Source 
Merge commit '87b455f5581b3cc3edb9003592a11a1a43104109' into eclair-plus-aosp

* commit '87b455f5581b3cc3edb9003592a11a1a43104109':
  Set a default dump type for DRT as a workaround for indeterministic order in receiving dumpAsText and onPageFinish callback.
This commit is contained in:
Guang Zhu
2009-09-01 12:05:47 -07:00
committed by Android Git Automerger
parent 8a6129d549 87b455f558
commit 84aa88a93b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java
View File

@@ -16,6 +16,7 @@
package com.android.dumprendertree; package com.android.dumprendertree;
import com.android.dumprendertree.TestShellActivity.DumpDataType;
import com.android.dumprendertree.forwarder.AdbUtils; import com.android.dumprendertree.forwarder.AdbUtils;
import com.android.dumprendertree.forwarder.ForwardServer; import com.android.dumprendertree.forwarder.ForwardServer;
@@ -399,7 +400,8 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh
if (resume) if (resume)
resumeTestList(); resumeTestList();
TestShellActivity activity = (TestShellActivity) getActivity(); TestShellActivity activity = getActivity();
activity.setDefaultDumpDataType(DumpDataType.DUMP_AS_TEXT);
// Run tests. // Run tests.
int addr = -1; int addr = -1;