| Index: chrome/browser/chromeos/arc/arc_settings_service.cc
|
| diff --git a/chrome/browser/chromeos/arc/arc_settings_service.cc b/chrome/browser/chromeos/arc/arc_settings_service.cc
|
| index cf9e79a157b30e0e3b91eaab4e670d8237a1d3c0..e22e010e12280c4f98854ac0d8c8ae8c948ef456 100644
|
| --- a/chrome/browser/chromeos/arc/arc_settings_service.cc
|
| +++ b/chrome/browser/chromeos/arc/arc_settings_service.cc
|
| @@ -476,9 +476,9 @@ void ArcSettingsServiceImpl::DefaultNetworkChanged(
|
| // kProxy pref and ONC policy have more priority than the default network
|
| // update.
|
| Profile* profile = ProfileManager::GetActiveUserProfile();
|
| - if (!chromeos::onc::HasPolicyForNetwork(
|
| - profile->GetPrefs(), g_browser_process->local_state(), *network) &&
|
| - !IsPrefProxyConfigApplied()) {
|
| + if (network && !IsPrefProxyConfigApplied() &&
|
| + !chromeos::onc::HasPolicyForNetwork(
|
| + profile->GetPrefs(), g_browser_process->local_state(), *network)) {
|
| SyncProxySettings();
|
| }
|
| }
|
|
|