commit 164657efe67e7d2ce02ec8804d04dd485f91a098
author Steve Block <steveblock@google.com> Thu Nov 19 15:55:42 2009 +0000
committer Steve Block <steveblock@google.com> Tue Nov 24 12:37:05 2009 +0000
tree cd3dc4f84c9c9482f326ad5f6b50beb009b1a707
parent 64278482f4df3591de4068b23307820f5e4aa930

Adds an explicit type for GeolocationPermissions.getOrigins. Do not merge.

BUG=2271636

This has already been submitted to eclair-mr2.

Change-Id: I8c79b949162a98c3711f01d9c6ebbf53959fd039

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

src/com/android/browser/WebsiteSettingsActivity.java

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()) {