commit | 44060f4d76e7625cf2ae6580afa606613ef1cb49 | [log] [tgz] |
---|---|---|
author | Guang Zhu <guangzhu@google.com> | Fri Jan 14 16:26:30 2011 -0800 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jan 14 16:26:30 2011 -0800 |
tree | 7a806a319acf26c897577b821af8d16e5fb72120 | |
parent | 751fdd9ab31048d726d551f9098b3f51239376f4 [diff] | |
parent | 4ce6e7c433a9ce8be0d3b08b37143c50a1057115 [diff] |
Merge "when test case times out, stop loading first" into honeycomb
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 void handleMessage(Message msg) { if (msg.what == MSG_TIMEOUT) { mTimedOut = true; + mWebView.stopLoading(); if (mCallback != null) mCallback.timedOut(mWebView.getUrl()); if (!mRequestedWebKitData) {