diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-24 22:11:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-24 22:11:52 -0700 |
| commit | d6abaf326ba4e0ff342cf28a828b75a334beba69 (patch) | |
| tree | 4ab689cdd5388445b67f235a65316b4583e5bc3e | |
| parent | c2f78020d3887539fc90230d96465e4b1dc84d8e (diff) | |
| parent | 145550a00ea59ff20133acc95315e463628e16db (diff) | |
| download | frameworks_base-d6abaf326ba4e0ff342cf28a828b75a334beba69.zip frameworks_base-d6abaf326ba4e0ff342cf28a828b75a334beba69.tar.gz frameworks_base-d6abaf326ba4e0ff342cf28a828b75a334beba69.tar.bz2 | |
am 145550a0: Merge "Document getPollBytes() and getActivationBytes()." into gingerbread
Merge commit '145550a00ea59ff20133acc95315e463628e16db' into gingerbread-plus-aosp
* commit '145550a00ea59ff20133acc95315e463628e16db':
Document getPollBytes() and getActivationBytes().
| -rw-r--r-- | core/java/android/nfc/Tag.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/core/java/android/nfc/Tag.java b/core/java/android/nfc/Tag.java index 7741ad2..f9205a6 100644 --- a/core/java/android/nfc/Tag.java +++ b/core/java/android/nfc/Tag.java @@ -149,6 +149,12 @@ public class Tag implements Parcelable { * Get the low-level bytes returned by this Tag at poll-time. * <p>These can be used to help with advanced identification of a Tag. * <p>The meaning of these bytes depends on the Tag technology. + * <p>ISO14443-3A: ATQA/SENS_RES + * <p>ISO14443-3B: Application data (4 bytes) and Protocol Info (3 bytes) from ATQB/SENSB_RES + * <p>JIS_X_6319_4: PAD0 (2 byte), PAD1 (2 byte), MRTI(2 byte), PAD2 (1 byte), RC (2 byte) + * <p>ISO15693: response flags (1 byte), DSFID (1 byte) + * from SENSF_RES + * * @return poll bytes, or null if they do not exist for this Tag technology */ public byte[] getPollBytes() { @@ -159,6 +165,12 @@ public class Tag implements Parcelable { * Get the low-level bytes returned by this Tag at activation-time. * <p>These can be used to help with advanced identification of a Tag. * <p>The meaning of these bytes depends on the Tag technology. + * <p>ISO14443-3A: SAK/SEL_RES + * <p>ISO14443-3B: null + * <p>ISO14443-3A & ISO14443-4: SAK/SEL_RES, historical bytes from ATS <TODO: confirm> + * <p>ISO14443-3B & ISO14443-4: ATTRIB response + * <p>JIS_X_6319_4: null + * <p>ISO15693: response flags (1 byte), DSFID (1 byte): null * @return activation bytes, or null if they do not exist for this Tag technology */ public byte[] getActivationBytes() { |