From 0123edd974f52d32072081a53ed9699515fcc566 Mon Sep 17 00:00:00 2001 From: finnur Date: Wed, 10 Jun 2015 17:58:32 -0700 Subject: [PATCH] Make sure the global toggle always updates for location. BUG=494991 Review URL: https://codereview.chromium.org/1170313002 Cr-Commit-Position: refs/heads/master@{#333865} --- .../chrome/browser/preferences/website/WebsitePreferences.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java index 2691e829b080..8508d14f1625 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java @@ -94,7 +94,10 @@ public class WebsitePreferences extends PreferenceFragment private void getInfoForOrigins() { if (mFilter.showGeolocationSites(mCategoryFilter) && !LocationSettings.getInstance().isSystemLocationSettingEnabled()) { - return; // No need to fetch any data if we're not going to show it. + // No need to fetch any data if we're not going to show it, but we do need to update + // the global toggle to reflect updates in Android settings (e.g. Location). + resetList(); + return; } WebsitePermissionsFetcher fetcher = new WebsitePermissionsFetcher(new ResultsPopulator()); -- 2.11.4.GIT