am c44c7a6b: Rename addConsoleMessage to onConsoleMessage to reflect SDK API changes. Do not merge.
Merge commit 'c44c7a6b4e98f9c7674165e547330c17075a3c55' into eclair-plus-aosp
* commit 'c44c7a6b4e98f9c7674165e547330c17075a3c55':
Rename addConsoleMessage to onConsoleMessage to reflect SDK API changes. Do not merge.
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 5937881..9030cf7 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -3448,13 +3448,15 @@
mTabControl.getCurrentTab().getGeolocationPermissionsPrompt().hide();
}
- /* Adds a JavaScript error message to the system log.
+ /* Adds a JavaScript error message to the system log and if the JS
+ * console is enabled in the about:debug options, to that console
+ * also.
* @param message The error message to report.
* @param lineNumber The line number of the error.
* @param sourceID The name of the source file that caused the error.
*/
@Override
- public void addMessageToConsole(String message, int lineNumber, String sourceID) {
+ public void onConsoleMessage(String message, int lineNumber, String sourceID) {
ErrorConsoleView errorConsole = mTabControl.getCurrentErrorConsole(true);
errorConsole.addErrorMessage(message, sourceID, lineNumber);
if (mShouldShowErrorConsole &&