summaryrefslogtreecommitdiffstats
path: root/core/java/android/nfc
diff options
context:
space:
mode:
authorMartijn Coenen <martijn.coenen@nxp.com>2011-01-18 21:22:08 +0100
committerNick Pelly <npelly@google.com>2011-01-18 15:35:14 -0800
commitcbec3fb285f3a4523efa8ae39f5f79fbda0acea9 (patch)
tree43f56d29104fa52e61a287d0e82961aae35a3708 /core/java/android/nfc
parent07e6f616d122496342a5bae51323bb218d88f7f2 (diff)
downloadframeworks_base-cbec3fb285f3a4523efa8ae39f5f79fbda0acea9.zip
frameworks_base-cbec3fb285f3a4523efa8ae39f5f79fbda0acea9.tar.gz
frameworks_base-cbec3fb285f3a4523efa8ae39f5f79fbda0acea9.tar.bz2
hange the default IsoDep timeout to 300ms (docs update).
Change-Id: I4fe5a6bf9fd42a28c9619e6e0bf11885bcc43f91
Diffstat (limited to 'core/java/android/nfc')
-rw-r--r--core/java/android/nfc/technology/IsoDep.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/nfc/technology/IsoDep.java b/core/java/android/nfc/technology/IsoDep.java
index 4b4efa4..d58de9e 100644
--- a/core/java/android/nfc/technology/IsoDep.java
+++ b/core/java/android/nfc/technology/IsoDep.java
@@ -66,7 +66,7 @@ public final class IsoDep extends BasicTagTechnology {
* aborted and the connection to the tag is lost. This setting is applied
* only to the {@link Tag} object linked to this technology and will be
* reset when {@link IsoDep#close} is called.
- * The default transaction timeout is 5 seconds.
+ * The default transaction timeout is 300 milliseconds.
*/
public void setTimeout(int timeout) {
try {