cellular: export the DBus.ServiceProperty
Export the DBus.ServiceProperty for cellular devices, which is the
service name of the modem manager that is handling the modem. This
allows Chrome to monitor for signals on a service name instead of a
connection name, and is consistent with the rest of Chrome's
monitoring infrastructure.
BUG=chromium-os:31757
TEST=run /usr/local/lib/flimflam/test/fake-gsm-modem --shill & list-devices
CQ-DEPEND=I0c42d65a7033beb8932303c62eb5dbfde411ea55
Change-Id: I872d9a5647fd9990f2b979e42837c46951dbd452
Reviewed-on: https://gerrit.chromium.org/gerrit/24613
Tested-by: Jason Glasgow <jglasgow@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Ready: Jason Glasgow <jglasgow@chromium.org>
diff --git a/modem.h b/modem.h
index 337c81e..a2f5af3 100644
--- a/modem.h
+++ b/modem.h
@@ -36,6 +36,7 @@
// the ModemManager.Modem DBus object path (e.g.,
// "/org/chromium/ModemManager/Gobi/0").
Modem(const std::string &owner,
+ const std::string &service,
const std::string &path,
ControlInterface *control_interface,
EventDispatcher *dispatcher,
@@ -54,6 +55,7 @@
void OnDeviceInfoAvailable(const std::string &link_name);
const std::string &owner() const { return owner_; }
+ const std::string &service() const { return service_; }
const std::string &path() const { return path_; }
void set_type(Cellular::Type type) { type_ = type; }
@@ -109,6 +111,7 @@
DBusPropertiesMap initial_modem_properties_;
const std::string owner_;
+ const std::string service_;
const std::string path_;
CellularRefPtr device_;
@@ -132,6 +135,7 @@
class ModemClassic : public Modem {
public:
ModemClassic(const std::string &owner,
+ const std::string &service,
const std::string &path,
ControlInterface *control_interface,
EventDispatcher *dispatcher,
@@ -155,6 +159,7 @@
class Modem1 : public Modem {
public:
Modem1(const std::string &owner,
+ const std::string &service,
const std::string &path,
ControlInterface *control_interface,
EventDispatcher *dispatcher,