commit 82f9ab3f404c8f414348c6effdc57c4d3b9223d7
author Jason Glasgow <jglasgow@chromium.org> Wed Apr 04 14:27:19 2012 -0400
committer Gerrit <chrome-bot@google.com> Fri Apr 13 13:06:39 2012 -0700
tree 7f3a87ab92732f8f0aae305334708034c764cebb
parent bc49ac7047b24da5672d08dfbf78cd680466b55a

shill: Add CellularCapabilityUniversal

Add the CellularCapabilityUniversal class so that shill can talk to a
ModemManager1 DBUS interface.  Ensure that a modems can be created
with either the new or the old modem manager running.

Register to receive DBus property changes from ModemManager1

BUG=chromium-os:28596, chromium-os:26650
TEST=Run unit tests, test that modem is created with Y3300

Change-Id: I8717318e944589bc85e763bd7234336559256dbc
Reviewed-on: https://gerrit.chromium.org/gerrit/19888
Commit-Ready: Jason Glasgow <jglasgow@chromium.org>
Reviewed-by: Jason Glasgow <jglasgow@chromium.org>
Tested-by: Jason Glasgow <jglasgow@chromium.org>

cellular_capability_gsm.cc

diff --git a/cellular_capability_gsm.cc b/cellular_capability_gsm.cc
index bfda762..461b3bf 100644
--- a/cellular_capability_gsm.cc
+++ b/cellular_capability_gsm.cc
@@ -44,7 +44,7 @@
 
 CellularCapabilityGSM::CellularCapabilityGSM(Cellular *cellular,
                                              ProxyFactory *proxy_factory)
-    : CellularCapability(cellular, proxy_factory),
+    : CellularCapabilityClassic(cellular, proxy_factory),
       weak_ptr_factory_(this),
       registration_state_(MM_MODEM_GSM_NETWORK_REG_STATUS_UNKNOWN),
       access_technology_(MM_MODEM_GSM_ACCESS_TECH_UNKNOWN),
@@ -90,7 +90,7 @@
 }
 
 void CellularCapabilityGSM::InitProxies() {
-  CellularCapability::InitProxies();
+  CellularCapabilityClassic::InitProxies();
   card_proxy_.reset(
       proxy_factory()->CreateModemGSMCardProxy(cellular()->dbus_path(),
                                                cellular()->dbus_owner()));
@@ -145,7 +145,7 @@
 
 void CellularCapabilityGSM::ReleaseProxies() {
   VLOG(2) << __func__;
-  CellularCapability::ReleaseProxies();
+  CellularCapabilityClassic::ReleaseProxies();
   card_proxy_.reset();
   network_proxy_.reset();
 }
@@ -201,7 +201,7 @@
   (*properties)[kConnectPropertyPhoneNumber].writer().append_string(
       kPhoneNumber);
 
-  if (!allow_roaming_)
+  if (!AllowRoaming())
     (*properties)[kConnectPropertyHomeOnly].writer().append_bool(true);
 
   if (!apn_try_list_.empty()) {
@@ -242,7 +242,13 @@
     cellular()->service()->SetLastGoodApn(apn_try_list_.front());
     apn_try_list_.clear();
   }
-  CellularCapability::OnConnectReply(callback, error);
+  CellularCapabilityClassic::OnConnectReply(callback, error);
+}
+
+bool CellularCapabilityGSM::AllowRoaming() {
+  bool requires_roaming =
+      home_provider_ ? home_provider_->requires_roaming : false;
+  return requires_roaming || allow_roaming_property();
 }
 
 // always called from an async context
@@ -569,14 +575,18 @@
                                         const GSMScanResults &results,
                                         const Error &error) {
   VLOG(2) << __func__;
-  if (error.IsFailure()) {
-    callback.Run(error);
-    return;
-  }
+
+  // Error handling is weak.  The current expectation is that on any
+  // error, found_networks_ should be cleared and a property change
+  // notification sent out.
+  //
+  // TODO(jglasgow): fix error handling
   found_networks_.clear();
-  for (GSMScanResults::const_iterator it = results.begin();
-       it != results.end(); ++it) {
-    found_networks_.push_back(ParseScanResult(*it));
+  if (!error.IsFailure()) {
+    for (GSMScanResults::const_iterator it = results.begin();
+         it != results.end(); ++it) {
+      found_networks_.push_back(ParseScanResult(*it));
+    }
   }
   cellular()->adaptor()->EmitStringmapsChanged(flimflam::kFoundNetworksProperty,
                                                found_networks_);