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

am 1cdb55aa: Merge change 27457 into eclair

Browse Source 
Merge commit '1cdb55aa97d8035a941a4bd7cf23063f18360ab5' into eclair-plus-aosp

* commit '1cdb55aa97d8035a941a4bd7cf23063f18360ab5':
  Added code style fix that actually did not get submitted in 2nd patch of previous change.
This commit is contained in:
Guang Zhu
2009-09-28 10:14:47 -07:00
committed by Android Git Automerger
parent 8580895575 1cdb55aa97
commit ecae28bc3e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,9 +63,9 @@ public class TestShellActivity extends Activity implements LayoutTestController
public void handleMessage(Message msg) { public void handleMessage(Message msg) {
if (msg.what == MSG_TIMEOUT) { if (msg.what == MSG_TIMEOUT) {
mTimedOut = true; mTimedOut = true;
if(mCallback != null) if (mCallback != null)
mCallback.timedOut(mWebView.getUrl()); mCallback.timedOut(mWebView.getUrl());
if(!mRequestedWebKitData) { if (!mRequestedWebKitData) {
requestWebKitData(); requestWebKitData();
} else { } else {
// if timed out and webkit data has been dumped before // if timed out and webkit data has been dumped before