summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2010-10-24 22:06:15 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-24 22:06:15 -0700
commit145550a00ea59ff20133acc95315e463628e16db (patch)
tree31ac424d4ab8f6621c448cc5eeb29bb4da71a99e /core
parent236568999411214ef440cabc6d12e3bf5f19d8f4 (diff)
parent416d72f4b6e68439828b9c189bd10cc0004f0f88 (diff)
downloadframeworks_base-145550a00ea59ff20133acc95315e463628e16db.zip
frameworks_base-145550a00ea59ff20133acc95315e463628e16db.tar.gz
frameworks_base-145550a00ea59ff20133acc95315e463628e16db.tar.bz2
Merge "Document getPollBytes() and getActivationBytes()." into gingerbread
Diffstat (limited to 'core')
-rw-r--r--core/java/android/nfc/Tag.java12
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() {