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

Unified Diff: chromeos/network/managed_network_configuration_handler_impl.cc

Issue 2836083002: [CrOS Tether] Update NetworkConfigurationHandler::GetShillProperties() to work with Tether networks. (Closed)
Patch Set: stevenjb@ comments. Created 3 years, 8 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
« no previous file with comments | « no previous file | chromeos/network/network_configuration_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/managed_network_configuration_handler_impl.cc
diff --git a/chromeos/network/managed_network_configuration_handler_impl.cc b/chromeos/network/managed_network_configuration_handler_impl.cc
index 8ada86f35ce871ea9c857f0f00718c159f95b5b4..f9b80551740fe7f523fd58afb11b2dfcabc665c3 100644
--- a/chromeos/network/managed_network_configuration_handler_impl.cc
+++ b/chromeos/network/managed_network_configuration_handler_impl.cc
@@ -38,6 +38,7 @@
#include "chromeos/network/policy_util.h"
#include "chromeos/network/prohibited_technologies_handler.h"
#include "chromeos/network/shill_property_util.h"
+#include "chromeos/network/tether_constants.h"
#include "components/onc/onc_constants.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
@@ -87,6 +88,13 @@ const base::DictionaryValue* GetByGUID(const GuidToPolicyMap& policies,
return it->second.get();
}
+bool IsTetherShillDictionary(const base::DictionaryValue& dict) {
+ std::string network_type;
+ return dict.GetStringWithoutPathExpansion(shill::kTypeProperty,
+ &network_type) &&
+ network_type == kTypeTether;
+}
+
} // namespace
struct ManagedNetworkConfigurationHandlerImpl::Policies {
@@ -143,13 +151,17 @@ void ManagedNetworkConfigurationHandlerImpl::SendManagedProperties(
&profile_path);
const NetworkProfile* profile =
network_profile_handler_->GetProfileForPath(profile_path);
- if (!profile)
+ if (!profile && !IsTetherShillDictionary(*shill_properties)) {
+ // Tether networks are not expected to have an associated profile; only
+ // log an error if the provided properties do not correspond to a
+ // Tether network.
NET_LOG_ERROR("No profile for service: " + profile_path, service_path);
+ }
std::unique_ptr<NetworkUIData> ui_data =
shill_property_util::GetUIDataFromProperties(*shill_properties);
- const base::DictionaryValue* user_settings = NULL;
+ const base::DictionaryValue* user_settings = nullptr;
if (ui_data && profile) {
user_settings = ui_data->user_settings();
@@ -172,8 +184,8 @@ void ManagedNetworkConfigurationHandlerImpl::SendManagedProperties(
&onc::kNetworkWithStateSignature,
network_state));
- const base::DictionaryValue* network_policy = NULL;
- const base::DictionaryValue* global_policy = NULL;
+ const base::DictionaryValue* network_policy = nullptr;
+ const base::DictionaryValue* global_policy = nullptr;
if (profile) {
const Policies* policies = GetPoliciesForProfile(*profile);
if (!policies) {
« no previous file with comments | « no previous file | chromeos/network/network_configuration_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698