Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(209)

Unified Diff: chromeos/network/onc/onc_translator_shill_to_onc.cc

Issue 535283002: Translate activation/romaing state, restricted pool (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_279351_internet_options_7b
Patch Set: Rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/network/onc/onc_translator_shill_to_onc.cc
diff --git a/chromeos/network/onc/onc_translator_shill_to_onc.cc b/chromeos/network/onc/onc_translator_shill_to_onc.cc
index 3abb44375c531743470b227a757659f8c48be251..c47d5dd49726e909facfeb8d8fad6085ea276519 100644
--- a/chromeos/network/onc/onc_translator_shill_to_onc.cc
+++ b/chromeos/network/onc/onc_translator_shill_to_onc.cc
@@ -315,6 +315,12 @@ void ShillToONCTranslator::TranslateWiFiWithState() {
void ShillToONCTranslator::TranslateCellularWithState() {
CopyPropertiesAccordingToSignature();
+ TranslateWithTableAndSet(shill::kActivationStateProperty,
+ kActivationStateTable,
+ ::onc::cellular::kActivationState);
+ TranslateWithTableAndSet(shill::kRoamingStateProperty,
+ kRoamingStateTable,
+ ::onc::cellular::kRoamingState);
const base::DictionaryValue* dictionary = NULL;
if (shill_dictionary_->GetDictionaryWithoutPathExpansion(
shill::kServingOperatorProperty, &dictionary)) {
@@ -402,6 +408,8 @@ void ShillToONCTranslator::TranslateNetworkWithState() {
}
onc_object_->SetStringWithoutPathExpansion(
::onc::network_config::kConnectionState, onc_state);
+ onc_object_->SetBooleanWithoutPathExpansion(
+ ::onc::network_config::kRestricted, state == shill::kStatePortal);
}
// Use a human-readable aa:bb format for any hardware MAC address. Note:

Powered by Google App Engine
This is Rietveld 408576698