commit 2a6a0f478fb9b67bf7398b1ba7c54ca9c9e430bf
author Steve Block <steveblock@google.com> Thu Nov 19 15:55:42 2009 +0000
committer Steve Block <steveblock@google.com> Thu Nov 19 20:00:21 2009 +0000
tree f976ce96e178960144fbd217751317b0c71714a4
parent 4af206a6f656a27cfd4004241e1b84e05489eb94

Adds an explicit type for GeolocationPermissions.getOrigins.

This is a partial fix for bug http://b/issue?id=2271636

Change-Id: If7c51332b8051ce2426d67962cb1cf2a9cb0f280

src/com/android/browser/BrowserPreferencesPage.java

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);
                 }

src/com/android/browser/BrowserSettings.java

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index bb369ae..d7b091f 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -530,8 +530,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);
                 }

src/com/android/browser/WebsiteSettingsActivity.java

diff --git a/src/com/android/browser/WebsiteSettingsActivity.java b/src/com/android/browser/WebsiteSettingsActivity.java
index a04c46f..430286f 100644
--- a/src/com/android/browser/WebsiteSettingsActivity.java
+++ b/src/com/android/browser/WebsiteSettingsActivity.java
@@ -226,8 +226,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()) {