summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nick Pelly <npelly@google.com> 2011-01-03 21:03:06 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-01-03 21:03:06 -0800
commit47fc50e53c141d528ee26c52ec0eaaa2140b311b (patch)
tree09297ea420053e6fb2f6ba456a7a57d0336d8622
parentb300ae40fce7644e760e27352f83cd41b27fbf76 (diff)
parenta3e4293cdc7d09ac93c95d233e4052ac4435773e (diff)
am a3e4293c: am 163bd407: Merge "Added getType() to NDEF technology class (API part)." into gingerbread
* commit 'a3e4293cdc7d09ac93c95d233e4052ac4435773e': Added getType() to NDEF technology class (API part).
-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 53db0c52bc2d..04f0797f3220 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() {