android-2.1_r1 snapshot
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 &&
diff --git a/src/com/android/browser/BrowserPreferencesPage.java b/src/com/android/browser/BrowserPreferencesPage.java
index fb0b2ba..1370722 100644
--- a/src/com/android/browser/BrowserPreferencesPage.java
+++ b/src/com/android/browser/BrowserPreferencesPage.java
@@ -98,8 +98,8 @@
}
}
});
- GeolocationPermissions.getInstance().getOrigins(new ValueCallback<Set>() {
- public void onReceiveValue(Set geolocationOrigins) {
+ GeolocationPermissions.getInstance().getOrigins(new ValueCallback<Set<String> >() {
+ public void onReceiveValue(Set<String> geolocationOrigins) {
if ((geolocationOrigins != null) && !geolocationOrigins.isEmpty()) {
websiteSettings.setEnabled(true);
}
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index e36d54b..9c5af34 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -538,8 +538,8 @@
}
});
- GeolocationPermissions.getInstance().getOrigins(new ValueCallback<Set>() {
- public void onReceiveValue(Set geolocationOrigins) {
+ GeolocationPermissions.getInstance().getOrigins(new ValueCallback<Set<String> >() {
+ public void onReceiveValue(Set<String> geolocationOrigins) {
if ((geolocationOrigins != null) && !geolocationOrigins.isEmpty()) {
screen.setEnabled(true);
}
diff --git a/src/com/android/browser/WebsiteSettingsActivity.java b/src/com/android/browser/WebsiteSettingsActivity.java
index 645e084..047867a 100644
--- a/src/com/android/browser/WebsiteSettingsActivity.java
+++ b/src/com/android/browser/WebsiteSettingsActivity.java
@@ -222,8 +222,8 @@
}
public void askForGeolocation(final Map sites) {
- GeolocationPermissions.getInstance().getOrigins(new ValueCallback<Set>() {
- public void onReceiveValue(Set origins) {
+ GeolocationPermissions.getInstance().getOrigins(new ValueCallback<Set<String> >() {
+ public void onReceiveValue(Set<String> origins) {
if (origins != null) {
Iterator<String> iter = origins.iterator();
while (iter.hasNext()) {