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

Commit b735aa0b authored by Nick Pelly's avatar Nick Pelly Committed by Android (Google) Code Review
Browse files

Merge "Fix javadoc which broke build." into gingerbread

parents 00118a48 a8ca533d

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,7 @@ public final class IsoDep extends BasicTagTechnology { 
    /**

    /**

     * Sets the timeout of an IsoDep transceive transaction in milliseconds.

     * Sets the timeout of an IsoDep transceive transaction in milliseconds.

     * If the transaction has not completed before the timeout,

     * If the transaction has not completed before the timeout,

     * any ongoing {@link BasicTagTechnology#transceive} operation will be

     * any ongoing {@link #transceive} operation will be

     * aborted and the connection to the tag is lost. This setting is applied

     * 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

     * only to the {@link Tag} object linked to this technology and will be

     * reset when {@link IsoDep#close} is called.

     * reset when {@link IsoDep#close} is called.