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/mm1_modem_modemcdma_proxy_interface.h b/mm1_modem_modemcdma_proxy_interface.h
index ee18506..7ca0aed 100644
--- a/mm1_modem_modemcdma_proxy_interface.h
+++ b/mm1_modem_modemcdma_proxy_interface.h
@@ -9,10 +9,9 @@
#include <base/basictypes.h>
-#include "shill/dbus_properties.h"
+#include "shill/callbacks.h"
namespace shill {
-class AsyncCallHandler;
class Error;
namespace mm1 {
@@ -20,20 +19,24 @@
// These are the methods that a
// org.freedesktop.ModemManager1.Modem.ModemCdma proxy must support.
// The interface is provided so that it can be mocked in tests. All
-// calls are made asynchronously. Call completion is signalled through
-// the corresponding 'OnXXXCallback' method in the ProxyDelegate
-// interface.
+// calls are made asynchronously. Call completion is signalled via
+// the callbacks passed to the methods.
class ModemModemCdmaProxyInterface {
public:
virtual ~ModemModemCdmaProxyInterface() {}
virtual void Activate(const std::string &carrier,
- AsyncCallHandler *call_handler,
+ Error *error,
+ const ResultCallback &callback,
int timeout) = 0;
virtual void ActivateManual(
const DBusPropertiesMap &properties,
- AsyncCallHandler *call_handler, int timeout) = 0;
+ Error *error,
+ const ResultCallback &callback,
+ int timeout) = 0;
+ virtual void set_activation_state_callback(
+ const ActivationStateSignalCallback &callback) = 0;
// Properties.
virtual std::string Meid() = 0;
@@ -44,27 +47,6 @@
virtual uint32_t EvdoRegistrationState() = 0;
};
-
-// ModemManager1.Modem.ModemCdma signal delegate to be associated with
-// the proxy.
-class ModemModemCdmaProxyDelegate {
- public:
- virtual ~ModemModemCdmaProxyDelegate() {}
-
- // handle signals
- virtual void OnActivationStateChanged(
- const uint32_t &activation_state,
- const uint32_t &activation_error,
- const DBusPropertiesMap &status_changes) = 0;
-
- // Handle async callbacks
- virtual void OnActivateCallback(const Error &error,
- AsyncCallHandler *call_handler) = 0;
- virtual void OnActivateManualCallback(
- const Error &error,
- AsyncCallHandler *call_handler) = 0;
-};
-
} // namespace mm1
} // namespace shill