Commit 095ef6f7 authored by Jérôme Lebel's avatar Jérôme Lebel Committed by Commit Bot

[iOS] Fixing crash in privacy settings

When unified consent is enabled, Privacy settings should not observe
metric reporting preferences. The metric reporting settings has been
moved Google Services settings.

Bug: 998500
Change-Id: I8e3cc2f91a88d373bf9e28ed3eacbe3d1b78d25f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1776048Reviewed-by: default avatarGauthier Ambard <gambard@chromium.org>
Commit-Queue: Jérôme Lebel <jlebel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#691653}
parent 18e89a11
...@@ -135,6 +135,7 @@ GURL kGoogleServicesSettingsURL("settings://open_google_services"); ...@@ -135,6 +135,7 @@ GURL kGoogleServicesSettingsURL("settings://open_google_services");
// screen. // screen.
_prefObserverBridge->ObserveChangesForPreference( _prefObserverBridge->ObserveChangesForPreference(
prefs::kIosHandoffToOtherDevices, &_prefChangeRegistrar); prefs::kIosHandoffToOtherDevices, &_prefChangeRegistrar);
if (!unified_consent::IsUnifiedConsentFeatureEnabled()) {
_prefObserverBridge->ObserveChangesForPreference( _prefObserverBridge->ObserveChangesForPreference(
metrics::prefs::kMetricsReportingEnabled, metrics::prefs::kMetricsReportingEnabled,
&_prefChangeRegistrarApplicationContext); &_prefChangeRegistrarApplicationContext);
...@@ -142,6 +143,7 @@ GURL kGoogleServicesSettingsURL("settings://open_google_services"); ...@@ -142,6 +143,7 @@ GURL kGoogleServicesSettingsURL("settings://open_google_services");
prefs::kMetricsReportingWifiOnly, prefs::kMetricsReportingWifiOnly,
&_prefChangeRegistrarApplicationContext); &_prefChangeRegistrarApplicationContext);
} }
}
return self; return self;
} }
...@@ -507,6 +509,7 @@ GURL kGoogleServicesSettingsURL("settings://open_google_services"); ...@@ -507,6 +509,7 @@ GURL kGoogleServicesSettingsURL("settings://open_google_services");
if (preferenceName == metrics::prefs::kMetricsReportingEnabled || if (preferenceName == metrics::prefs::kMetricsReportingEnabled ||
preferenceName == prefs::kMetricsReportingWifiOnly) { preferenceName == prefs::kMetricsReportingWifiOnly) {
DCHECK(!unified_consent::IsUnifiedConsentFeatureEnabled());
if (base::FeatureList::IsEnabled(kUmaCellular)) { if (base::FeatureList::IsEnabled(kUmaCellular)) {
bool isOn = GetApplicationContext()->GetLocalState()->GetBoolean( bool isOn = GetApplicationContext()->GetLocalState()->GetBoolean(
metrics::prefs::kMetricsReportingEnabled); metrics::prefs::kMetricsReportingEnabled);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment