summaryrefslogtreecommitdiffstats
path: root/chromeos
diff options
context:
space:
mode:
authordeymo@chromium.org <deymo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-21 02:38:56 +0000
committerdeymo@chromium.org <deymo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-21 02:38:56 +0000
commita1b8e186f16f0575eecabd744f77c6be1f177a35 (patch)
treed56050fea1fbcb7bfe9afa9eb944ae333d59dde7 /chromeos
parent549c238c049ea78dd634d2b63c4b6517e579c092 (diff)
downloadchromium_src-a1b8e186f16f0575eecabd744f77c6be1f177a35.zip
chromium_src-a1b8e186f16f0575eecabd744f77c6be1f177a35.tar.gz
chromium_src-a1b8e186f16f0575eecabd744f77c6be1f177a35.tar.bz2
Bluetooth: Increase the DBus CreatePairedDevice timeout to 120s
The previous timeout was 70 seconds, and given the feedback saw, it wasn't enough. BUG=chromium-os:37387 TEST=Connect/pair to a device and let it timeout. An "Unknown error" should NOT be shown. Review URL: https://chromiumcodereview.appspot.com/12289017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
-rw-r--r--chromeos/dbus/bluetooth_adapter_client.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromeos/dbus/bluetooth_adapter_client.cc b/chromeos/dbus/bluetooth_adapter_client.cc
index 57cc88c..b6fd150 100644
--- a/chromeos/dbus/bluetooth_adapter_client.cc
+++ b/chromeos/dbus/bluetooth_adapter_client.cc
@@ -24,7 +24,7 @@ namespace {
// The |CreatePairedDevice| DBus call needs a longer timeout than the default
// in order to allow BlueZ to timeout this call first. See crosbug.com/37387.
-const int kCreatePairedDeviceTimeoutMs = 70 * 1000;
+const int kCreatePairedDeviceTimeoutMs = 120 * 1000;
} // namespace