summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2011-01-03 20:58:26 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-03 20:58:26 -0800
commit163bd407492bbadcdc8f0759191e1b9142d06859 (patch)
treeeea8c145853e247d69791a2bf803335a02700812 /core/java
parent8c09ef91aef0706a012e449ba3d16c03e0d64508 (diff)
parentd27ebf1e698c4e6929cb635768031a2e25b18acd (diff)
downloadframeworks_base-163bd407492bbadcdc8f0759191e1b9142d06859.zip
frameworks_base-163bd407492bbadcdc8f0759191e1b9142d06859.tar.gz
frameworks_base-163bd407492bbadcdc8f0759191e1b9142d06859.tar.bz2
Merge "Added getType() to NDEF technology class (API part)." into gingerbread
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/nfc/technology/Ndef.java19
1 files changed, 19 insertions, 0 deletions
diff --git a/core/java/android/nfc/technology/Ndef.java b/core/java/android/nfc/technology/Ndef.java
index 53db0c5..04f0797 100644
--- a/core/java/android/nfc/technology/Ndef.java
+++ b/core/java/android/nfc/technology/Ndef.java
@@ -54,9 +54,20 @@ public final class Ndef extends BasicTagTechnology {
/** @hide */
public static final String EXTRA_NDEF_CARDSTATE = "ndefcardstate";
+ /** @hide */
+ public static final String EXTRA_NDEF_TYPE = "ndeftype";
+
+ public static final int UNKNOWN_TAG = 0;
+ public static final int TYPE1_TAG = 1;
+ public static final int TYPE2_TAG = 2;
+ public static final int TYPE3_TAG = 3;
+ public static final int TYPE4_TAG = 4;
+ public static final int MIFARE_CLASSIC_TAG = 5;
+
private final int mMaxNdefSize;
private final int mCardState;
private final NdefMessage mNdefMsg;
+ private final int mNdefType;
/**
* Internal constructor, to be used by NfcAdapter
@@ -68,6 +79,7 @@ public final class Ndef extends BasicTagTechnology {
mMaxNdefSize = extras.getInt(EXTRA_NDEF_MAXLENGTH);
mCardState = extras.getInt(EXTRA_NDEF_CARDSTATE);
mNdefMsg = extras.getParcelable(EXTRA_NDEF_MSG);
+ mNdefType = extras.getInt(EXTRA_NDEF_TYPE);
} else {
throw new NullPointerException("NDEF tech extras are null.");
}
@@ -92,6 +104,13 @@ public final class Ndef extends BasicTagTechnology {
}
/**
+ * Get NDEF card type
+ */
+ public int getType() {
+ return mNdefType;
+ }
+
+ /**
* Get maximum NDEF message size in bytes
*/
public int getMaxSize() {