Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16fad45b authored by Nick Pelly's avatar Nick Pelly Committed by Android Git Automerger
Browse files

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

* commit 'e4dd154c':
  hange the default IsoDep timeout to 300ms (docs update).
parents 14f3d862 e4dd154c

core/java/android/nfc/technology/IsoDep.java

+1 −1
Original line number Diff line number Diff line
@@ -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 {