Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread

2011-01-18 16:11:14 -08:00
parent 12d014fdf4 cbec3fb285
commit e4dd154c08
1 changed files with 1 additions and 1 deletions
--- 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 {