Merge change 22262 into eclair

* changes:
  Adds Java-side of logic to make Geolocation obey Browser 'Enable Location' setting.

1 files changed, 13 insertions, 0 deletions

diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index eeac1d268eaf..4bdd488269bc 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -167,6 +167,7 @@ public class WebSettings {
     private boolean         mDatabaseEnabled = false;
     private boolean         mDomStorageEnabled = false;
     private boolean         mWorkersEnabled = false;  // only affects V8.
+    private boolean         mGeolocationEnabled = false;
     // HTML5 configuration parameters
     private long            mAppCacheMaxSize = Long.MAX_VALUE;
     private String          mAppCachePath = "";
@@ -1082,6 +1083,18 @@ public class WebSettings {
     }
 
     /**
+     * Sets whether Geolocation is enabled.
+     * @param flag Whether Geolocation should be enabled.
+     * @hide pending api council approval
+     */
+    public synchronized void setGeolocationEnabled(boolean flag) {
+        if (mGeolocationEnabled != flag) {
+            mGeolocationEnabled = flag;
+            postSync();
+        }
+    }
+
+    /**
      * Return true if javascript is enabled. <b>Note: The default is false.</b>
      * @return True if javascript is enabled.
      */