[go: up one dir, main page]

device/fido: Increase timeout for FIDO connection

(Merge to M76.)

Since CL:1582274, timeout actually worked. This makes Chrome OS hit the
timeout since there is the overhead of GATT services browsing in BlueZ.
This CL increases the timeout from 3 to 10 seconds to accommodate this.

BUG=b:133097385,971898

(cherry picked from commit f0ceb74419c092d727bc0af102788a574ed12835)

Change-Id: Ib8c74a1632897547f3d600b59376d9e31d4d109b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1648898
Commit-Queue: Martin Kreichgauer <martinkr@google.com>
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#666960}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1652568
Reviewed-by: Adam Langley <agl@chromium.org>
Cr-Commit-Position: refs/branch-heads/3809@{#202}
Cr-Branched-From: d82dec1a818f378c464ba307ddd9c92133eac355-refs/heads/master@{#665002}
diff --git a/device/fido/fido_constants.cc b/device/fido/fido_constants.cc
index 3e6aea5..e0a3261 100644
--- a/device/fido/fido_constants.cc
+++ b/device/fido/fido_constants.cc
@@ -31,7 +31,7 @@
 const char kCredentialManagementPreviewMapKey[] = "credentialMgmtPreview";
 const char kBioEnrollmentPreviewMapKey[] = "userVerificationMgmtPreview";
 
-const base::TimeDelta kDeviceTimeout = base::TimeDelta::FromSeconds(3);
+const base::TimeDelta kDeviceTimeout = base::TimeDelta::FromSeconds(10);
 const base::TimeDelta kU2fRetryDelay = base::TimeDelta::FromMilliseconds(200);
 
 const char kFormatKey[] = "fmt";