Sets or clears Geolocation permissions for Google origins when the 'Location & privacy - Share with Google' sysetm setting is changed.

This fixes bug http://b/issue?id=1933893

1 files changed, 6 insertions, 0 deletions

diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index e8b2702..3793dd5 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -189,6 +189,10 @@ public class WebSettings {
     private boolean         mAllowFileAccess = true;
     private boolean         mLoadWithOverviewMode = true;
 
+    // Manages interaction of the system setting 'Location & security - Share
+    // with Google' and the browser.
+    static GoogleLocationSettingManager sGoogleLocationSettingManager;
+
     // Class to handle messages before WebCore is ready.
     private class EventHandler {
         // Message id for syncing
@@ -1315,6 +1319,8 @@ public class WebSettings {
         if (DebugFlags.WEB_SETTINGS) {
             junit.framework.Assert.assertTrue(frame.mNativeFrame != 0);
         }
+        sGoogleLocationSettingManager = new GoogleLocationSettingManager(mContext);
+        sGoogleLocationSettingManager.start();
         nativeSync(frame.mNativeFrame);
         mSyncPending = false;
         mEventHandler.createHandler();