From: Steve Block <steveblock@google.com>
Date: Thu, 19 Nov 2009 15:55:42 +0000 (+0000)
Subject: Adds an explicit type for GeolocationPermissions.getOrigins. Do not merge.
X-Git-Tag: android-x86-2.2~137^2~8^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=164657ef;p=android-x86%2Fpackages-apps-Browser.git

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

BUG=2271636

This has already been submitted to eclair-mr2.

Change-Id: I8c79b949162a98c3711f01d9c6ebbf53959fd039
---

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 @@ public class BrowserPreferencesPage extends PreferenceActivity
                 }
             }
         });
-        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 @@ class BrowserSettings extends Observable {
             }
         });
 
-        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 class WebsiteSettingsActivity extends ListActivity {
         }
 
         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()) {