Make Enable/Disable work using new callbacks for async support.
Use new-style callbacks to implement the Manager EnableTechnology
and DisableTechnology operations asynchronously. This allows
devices to be enabled and disabled from the UI ,and for the UI
to display available networks once the device is enabled.
Removed the behavior whereby setting the Device.Powered property
had the side effect of enabling or disabling the device. To
replace this, I added new Device.Enable and Device.Disable calls
for enabling and disabling individual devices.
Also separated the in-memory value of the Powered property from
the persisted value. Whenever a client requests that a device
be enabled or disabled, the desired power state is immediately
saved in the profile, but the in-memory value isn't updated until
the operation completes. On startup, shill now automatically
starts any devices for which the persistent Powered property
is set, and does not start devices for which it is not set.
BUG=chromium-os:23319,chromium-os:27814
TEST=Manual testing on device + unit tests passing.
Change-Id: Id676be3fc662cfd5efb730c67687edfd16b2dc6b
Reviewed-on: https://gerrit.chromium.org/gerrit/18123
Commit-Ready: Eric Shienbrood <ers@chromium.org>
Reviewed-by: Eric Shienbrood <ers@chromium.org>
Tested-by: Eric Shienbrood <ers@chromium.org>
diff --git a/modem_proxy.h b/modem_proxy.h
index d5021f6..8e21bf0 100644
--- a/modem_proxy.h
+++ b/modem_proxy.h
@@ -18,31 +18,35 @@
class ModemProxy : public ModemProxyInterface {
public:
// Constructs a ModemManager.Modem DBus object proxy at |path| owned by
- // |service|. Caught signals will be dispatched to |delegate|.
- ModemProxy(ModemProxyDelegate *delegate,
- DBus::Connection *connection,
+ // |service|.
+ ModemProxy(DBus::Connection *connection,
const std::string &path,
const std::string &service);
virtual ~ModemProxy();
// Inherited from ModemProxyInterface.
- virtual void Enable(bool enable, AsyncCallHandler *call_handler, int timeout);
- // TODO(ers): temporarily advertise the blocking version
- // of Enable, until Cellular::Stop is converted for async.
- virtual void Enable(bool enable);
- virtual void Disconnect();
- virtual void GetModemInfo(AsyncCallHandler *call_handler, int timeout);
+ virtual void Enable(bool enable, Error *error,
+ const ResultCallback &callback, int timeout);
+ virtual void Disconnect(Error *error, const ResultCallback &callback,
+ int timeout);
+ virtual void GetModemInfo(Error *error, const ModemInfoCallback &callback,
+ int timeout);
+
+ virtual void set_state_changed_callback(
+ const ModemStateChangedSignalCallback &callback);
private:
class Proxy : public org::freedesktop::ModemManager::Modem_proxy,
public DBus::ObjectProxy {
public:
- Proxy(ModemProxyDelegate *delegate,
- DBus::Connection *connection,
+ Proxy(DBus::Connection *connection,
const std::string &path,
const std::string &service);
virtual ~Proxy();
+ void set_state_changed_callback(
+ const ModemStateChangedSignalCallback &callback);
+
private:
// Signal callbacks inherited from ModemManager::Modem_proxy.
virtual void StateChanged(
@@ -54,7 +58,7 @@
const DBus::Error &dberror, void *data);
virtual void DisconnectCallback(const DBus::Error &dberror, void *data);
- ModemProxyDelegate *delegate_;
+ ModemStateChangedSignalCallback state_changed_callback_;
DISALLOW_COPY_AND_ASSIGN(Proxy);
};