diff options
| author | Ben Murdoch <benm@google.com> | 2009-11-25 02:43:47 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-25 02:43:47 -0800 |
| commit | d0be07cb285e783723767747a3d8fd098a0441d2 (patch) | |
| tree | 73d130f9428ffa829f593b9ced6d9ee950a8c5e9 /tests | |
| parent | 398d197c792dd8732453aa2aaa2352c8982af9ae (diff) | |
| parent | 7f7c16dee2f825f37aec4d457bdf5ec9b8109a47 (diff) | |
| download | frameworks_base-d0be07cb285e783723767747a3d8fd098a0441d2.zip frameworks_base-d0be07cb285e783723767747a3d8fd098a0441d2.tar.gz frameworks_base-d0be07cb285e783723767747a3d8fd098a0441d2.tar.bz2 | |
am 7f7c16de: Merge changes I0c77eca9,Ibd184157,I81947f67 into eclair
Merge commit '7f7c16dee2f825f37aec4d457bdf5ec9b8109a47' into eclair-plus-aosp
* commit '7f7c16dee2f825f37aec4d457bdf5ec9b8109a47':
Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
Improves documentation for GeolocationPermissions class. Do not merge.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java index c084f8c..aeb55b4 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java @@ -638,7 +638,7 @@ public class TestShellActivity extends Activity implements LayoutTestController } @Override - public void addMessageToConsole(String message, int lineNumber, + public void onConsoleMessage(String message, int lineNumber, String sourceID) { if (mConsoleMessages == null) { mConsoleMessages = new StringBuffer(); |