Bluetooth: Increment the timeout for Connect dbus call

chromeos/dbus/bluetooth_input_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/dbus/bluetooth_input_client.h"
 
 #include <map>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "chromeos/dbus/bluetooth_adapter_client.h"
 #include "chromeos/dbus/bluetooth_property.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
+namespace {
+
+// The |Connect| DBus call needs a longer timeout than the default in order to
+// give BlueZ enough time to return the timeout error response.
+// See crosbug.com/37607
+const int kConnectTimeoutMs = 50 * 1000;
+
+} // namespace
+
 namespace chromeos {
 
 const char BluetoothInputClient::kNoResponseError[] =
     "org.chromium.Error.NoResponse";
 
 BluetoothInputClient::Properties::Properties(
     dbus::ObjectProxy* object_proxy,
     const PropertyChangedCallback& callback)
     : BluetoothPropertySet(object_proxy,
                            bluetooth_input::kBluetoothInputInterface,
@@ skipping 54 matching lines @@
                        const ConnectCallback& callback,
                        const ConnectErrorCallback& error_callback) OVERRIDE {
     dbus::MethodCall method_call(
         bluetooth_input::kBluetoothInputInterface,
         bluetooth_input::kConnect);
 
     dbus::ObjectProxy* object_proxy = GetObjectProxy(object_path);
 
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
-        dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        kConnectTimeoutMs,
         base::Bind(&BluetoothInputClientImpl::OnConnect,
                    weak_ptr_factory_.GetWeakPtr(), object_path,
                    callback),
         base::Bind(&BluetoothInputClientImpl::OnConnectError,
                    weak_ptr_factory_.GetWeakPtr(), object_path,
                    error_callback));
   }
 
   // BluetoothInputClient override.
   virtual void Disconnect(const dbus::ObjectPath& object_path,
@@ skipping 179 matching lines @@
     DBusClientImplementationType type,
     dbus::Bus* bus,
     BluetoothAdapterClient* adapter_client) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new BluetoothInputClientImpl(bus, adapter_client);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new BluetoothInputClientStubImpl();
 }
 
 }  // namespace chromeos