aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorguoyin.chen <guoyin.chen@freescale.com>2016-05-07 00:07:30 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-07 00:07:30 +0000
commit9f450c918a39099a159384c5bc691d3e9937dafb (patch)
tree2948b91552ee7cf083f0de1ca958e427843969ea
parent0d57d947348dfd819daeacb36c320883e860df43 (diff)
parente477f1e5fd82dfcb545b9f57b98b0d3384ac75de (diff)
downloadweaved-9f450c918a39099a159384c5bc691d3e9937dafb.tar.gz
Add check for the selected_service before calling GetProperties
am: e477f1e5fd * commit 'e477f1e5fd82dfcb545b9f57b98b0d3384ac75de': Add check for the selected_service before calling GetProperties Change-Id: I0272c6907d5e66a990021c18322d0b0f7f98d08d
-rw-r--r--buffet/shill_client.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/buffet/shill_client.cc b/buffet/shill_client.cc
index 8e6e1e9..afaebba 100644
--- a/buffet/shill_client.cc
+++ b/buffet/shill_client.cc
@@ -219,8 +219,10 @@ void ShillClient::StopAccessPoint() {
std::string ShillClient::GetConnectedSsid() const {
for (const auto& kv : devices_) {
VariantDictionary properties;
- if (!kv.second.selected_service->GetProperties(&properties, nullptr))
+ if (kv.second.selected_service &&
+ (!kv.second.selected_service->GetProperties(&properties, nullptr))) {
continue;
+ }
auto property_it = properties.find(shill::kWifiHexSsid);
if (property_it == properties.end()) continue;