diff options
| author | Guang Zhu <guangzhu@google.com> | 2011-01-14 16:26:30 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-14 16:26:30 -0800 |
| commit | 44060f4d76e7625cf2ae6580afa606613ef1cb49 (patch) | |
| tree | 7a806a319acf26c897577b821af8d16e5fb72120 /tests/DumpRenderTree | |
| parent | 751fdd9ab31048d726d551f9098b3f51239376f4 (diff) | |
| parent | 4ce6e7c433a9ce8be0d3b08b37143c50a1057115 (diff) | |
| download | frameworks_base-44060f4d76e7625cf2ae6580afa606613ef1cb49.zip frameworks_base-44060f4d76e7625cf2ae6580afa606613ef1cb49.tar.gz frameworks_base-44060f4d76e7625cf2ae6580afa606613ef1cb49.tar.bz2 | |
Merge "when test case times out, stop loading first" into honeycomb
Diffstat (limited to 'tests/DumpRenderTree')
| -rw-r--r-- | tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java index 9ccb3ee..a3466e2 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java @@ -75,6 +75,7 @@ public class TestShellActivity extends Activity implements LayoutTestController public void handleMessage(Message msg) { if (msg.what == MSG_TIMEOUT) { mTimedOut = true; + mWebView.stopLoading(); if (mCallback != null) mCallback.timedOut(mWebView.getUrl()); if (!mRequestedWebKitData) { |