diff options
| -rw-r--r-- | core/java/android/nfc/tech/IsoDep.java | 4 | ||||
| -rw-r--r-- | core/java/android/nfc/tech/MifareClassic.java | 2 | ||||
| -rw-r--r-- | core/java/android/nfc/tech/MifareUltralight.java | 2 | ||||
| -rw-r--r-- | core/java/android/nfc/tech/Ndef.java | 4 | ||||
| -rw-r--r-- | core/java/android/nfc/tech/NdefFormatable.java | 1 | ||||
| -rw-r--r-- | core/java/android/nfc/tech/NfcA.java | 2 | ||||
| -rw-r--r-- | core/java/android/nfc/tech/NfcF.java | 2 | ||||
| -rw-r--r-- | core/java/android/nfc/tech/TagTechnology.java | 3 |
8 files changed, 20 insertions, 0 deletions
diff --git a/core/java/android/nfc/tech/IsoDep.java b/core/java/android/nfc/tech/IsoDep.java index 089b1599ec06..0ba0c5a8d13b 100644 --- a/core/java/android/nfc/tech/IsoDep.java +++ b/core/java/android/nfc/tech/IsoDep.java @@ -88,6 +88,7 @@ public final class IsoDep extends BasicTagTechnology { * <p class="note">Requires the {@link android.Manifest.permission#NFC} permission. * * @param timeout timeout value in milliseconds + * @throws SecurityException if the tag object is reused after the tag has left the field */ public void setTimeout(int timeout) { try { @@ -106,6 +107,7 @@ public final class IsoDep extends BasicTagTechnology { * <p class="note">Requires the {@link android.Manifest.permission#NFC} permission. * * @return timeout value in milliseconds + * @throws SecurityException if the tag object is reused after the tag has left the field */ public int getTimeout() { try { @@ -167,6 +169,7 @@ public final class IsoDep extends BasicTagTechnology { * @return response bytes received, will not be null * @throws TagLostException if the tag leaves the field * @throws IOException if there is an I/O failure, or this operation is canceled + * @throws SecurityException if the tag object is reused after the tag has left the field */ public byte[] transceive(byte[] data) throws IOException { return transceive(data, true); @@ -193,6 +196,7 @@ public final class IsoDep extends BasicTagTechnology { * support. * * @return whether the NFC adapter on this device supports extended length APDUs. + * @throws SecurityException if the tag object is reused after the tag has left the field */ public boolean isExtendedLengthApduSupported() { try { diff --git a/core/java/android/nfc/tech/MifareClassic.java b/core/java/android/nfc/tech/MifareClassic.java index 080e058737b6..26f54e692289 100644 --- a/core/java/android/nfc/tech/MifareClassic.java +++ b/core/java/android/nfc/tech/MifareClassic.java @@ -597,6 +597,7 @@ public final class MifareClassic extends BasicTagTechnology { * <p class="note">Requires the {@link android.Manifest.permission#NFC} permission. * * @param timeout timeout value in milliseconds + * @throws SecurityException if the tag object is reused after the tag has left the field */ public void setTimeout(int timeout) { try { @@ -615,6 +616,7 @@ public final class MifareClassic extends BasicTagTechnology { * <p class="note">Requires the {@link android.Manifest.permission#NFC} permission. * * @return timeout value in milliseconds + * @throws SecurityException if the tag object is reused after the tag has left the field */ public int getTimeout() { try { diff --git a/core/java/android/nfc/tech/MifareUltralight.java b/core/java/android/nfc/tech/MifareUltralight.java index dec2c6548ab5..c0416a39ba76 100644 --- a/core/java/android/nfc/tech/MifareUltralight.java +++ b/core/java/android/nfc/tech/MifareUltralight.java @@ -236,6 +236,7 @@ public final class MifareUltralight extends BasicTagTechnology { * <p class="note">Requires the {@link android.Manifest.permission#NFC} permission. * * @param timeout timeout value in milliseconds + * @throws SecurityException if the tag object is reused after the tag has left the field */ public void setTimeout(int timeout) { try { @@ -255,6 +256,7 @@ public final class MifareUltralight extends BasicTagTechnology { * <p class="note">Requires the {@link android.Manifest.permission#NFC} permission. * * @return timeout value in milliseconds + * @throws SecurityException if the tag object is reused after the tag has left the field */ public int getTimeout() { try { diff --git a/core/java/android/nfc/tech/Ndef.java b/core/java/android/nfc/tech/Ndef.java index 225636565480..bb750cfbd82d 100644 --- a/core/java/android/nfc/tech/Ndef.java +++ b/core/java/android/nfc/tech/Ndef.java @@ -261,6 +261,7 @@ public final class Ndef extends BasicTagTechnology { * @throws TagLostException if the tag leaves the field * @throws IOException if there is an I/O failure, or the operation is canceled * @throws FormatException if the NDEF Message on the tag is malformed + * @throws SecurityException if the tag object is reused after the tag has left the field */ public NdefMessage getNdefMessage() throws IOException, FormatException { checkConnected(); @@ -301,6 +302,7 @@ public final class Ndef extends BasicTagTechnology { * @throws TagLostException if the tag leaves the field * @throws IOException if there is an I/O failure, or the operation is canceled * @throws FormatException if the NDEF Message to write is malformed + * @throws SecurityException if the tag object is reused after the tag has left the field */ public void writeNdefMessage(NdefMessage msg) throws IOException, FormatException { checkConnected(); @@ -339,6 +341,7 @@ public final class Ndef extends BasicTagTechnology { * <p>Does not cause any RF activity and does not block. * * @return true if it is possible to make this tag read-only + * @throws SecurityException if the tag object is reused after the tag has left the field */ public boolean canMakeReadOnly() { INfcTag tagService = mTag.getTagService(); @@ -370,6 +373,7 @@ public final class Ndef extends BasicTagTechnology { * @return true on success, false if it is not possible to make this tag read-only * @throws TagLostException if the tag leaves the field * @throws IOException if there is an I/O failure, or the operation is canceled + * @throws SecurityException if the tag object is reused after the tag has left the field */ public boolean makeReadOnly() throws IOException { checkConnected(); diff --git a/core/java/android/nfc/tech/NdefFormatable.java b/core/java/android/nfc/tech/NdefFormatable.java index 4175cd08804c..f19d30258393 100644 --- a/core/java/android/nfc/tech/NdefFormatable.java +++ b/core/java/android/nfc/tech/NdefFormatable.java @@ -111,6 +111,7 @@ public final class NdefFormatable extends BasicTagTechnology { * @throws TagLostException if the tag leaves the field * @throws IOException if there is an I/O failure, or the operation is canceled * @throws FormatException if the NDEF Message to write is malformed + * @throws SecurityException if the tag object is reused after the tag has left the field */ public void formatReadOnly(NdefMessage firstMessage) throws IOException, FormatException { format(firstMessage, true); diff --git a/core/java/android/nfc/tech/NfcA.java b/core/java/android/nfc/tech/NfcA.java index 88730f9af3df..7e6648361670 100644 --- a/core/java/android/nfc/tech/NfcA.java +++ b/core/java/android/nfc/tech/NfcA.java @@ -141,6 +141,7 @@ public final class NfcA extends BasicTagTechnology { * <p class="note">Requires the {@link android.Manifest.permission#NFC} permission. * * @param timeout timeout value in milliseconds + * @throws SecurityException if the tag object is reused after the tag has left the field */ public void setTimeout(int timeout) { try { @@ -159,6 +160,7 @@ public final class NfcA extends BasicTagTechnology { * <p class="note">Requires the {@link android.Manifest.permission#NFC} permission. * * @return timeout value in milliseconds + * @throws SecurityException if the tag object is reused after the tag has left the field */ public int getTimeout() { try { diff --git a/core/java/android/nfc/tech/NfcF.java b/core/java/android/nfc/tech/NfcF.java index 44871212daef..2ccd38875f07 100644 --- a/core/java/android/nfc/tech/NfcF.java +++ b/core/java/android/nfc/tech/NfcF.java @@ -145,6 +145,7 @@ public final class NfcF extends BasicTagTechnology { * <p class="note">Requires the {@link android.Manifest.permission#NFC} permission. * * @param timeout timeout value in milliseconds + * @throws SecurityException if the tag object is reused after the tag has left the field */ public void setTimeout(int timeout) { try { @@ -163,6 +164,7 @@ public final class NfcF extends BasicTagTechnology { * <p class="note">Requires the {@link android.Manifest.permission#NFC} permission. * * @return timeout value in milliseconds + * @throws SecurityException if the tag object is reused after the tag has left the field */ public int getTimeout() { try { diff --git a/core/java/android/nfc/tech/TagTechnology.java b/core/java/android/nfc/tech/TagTechnology.java index 0e2c7c18c61c..839fe429b338 100644 --- a/core/java/android/nfc/tech/TagTechnology.java +++ b/core/java/android/nfc/tech/TagTechnology.java @@ -176,6 +176,7 @@ public interface TagTechnology extends Closeable { * @see #close() * @throws TagLostException if the tag leaves the field * @throws IOException if there is an I/O failure, or connect is canceled + * @throws SecurityException if the tag object is reused after the tag has left the field */ public void connect() throws IOException; @@ -193,6 +194,7 @@ public interface TagTechnology extends Closeable { * @see #close() * @throws TagLostException if the tag leaves the field * @throws IOException if there is an I/O failure, or connect is canceled + * @throws SecurityException if the tag object is reused after the tag has left the field * @hide */ public void reconnect() throws IOException; @@ -205,6 +207,7 @@ public interface TagTechnology extends Closeable { * <p class="note">Requires the {@link android.Manifest.permission#NFC} permission. * * @see #connect() + * @throws SecurityException if the tag object is reused after the tag has left the field */ public void close() throws IOException; |