shill: wimax: Handle race between manual connect and auto connect.
BUG=chrome-os-partner:10578
TEST=Verify that Chrome does not notify an error in case there is a
race between manual connect and auto connect.
Change-Id: I8d07b58eb57bf8a7f0cf6ce047e43156467bb8e1
Reviewed-on: https://gerrit.chromium.org/gerrit/25432
Reviewed-by: Thieu Le <thieule@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Ready: Ben Chan <benchan@chromium.org>
diff --git a/wimax_service.cc b/wimax_service.cc
index 35b3cfd..c3d075e 100644
--- a/wimax_service.cc
+++ b/wimax_service.cc
@@ -127,8 +127,10 @@
void WiMaxService::Connect(Error *error) {
if (device_) {
- Error::PopulateAndLog(
- error, Error::kAlreadyConnected, "Already connected.");
+ // TODO(benchan): Populate error again after changing the way that
+ // Chrome handles Error::kAlreadyConnected situation.
+ LOG(WARNING) << "Service " << GetStorageIdentifier()
+ << " is already being connected or already connected.";
return;
}
if (!connectable()) {