summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Hamilton <jham@android.com> 2011-02-24 20:45:27 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-02-24 20:45:27 -0800
commit098f05e0e22274689e151b34752b0aeb151dff85 (patch)
treeeb89d3e059c559680bb437f4ef4aff8556ab5fc6
parent814f6cbf421df9a47eb99fed68eb46a49c0ae76e (diff)
parent09979bcf730e7df033ab0d8cadf564873c7e624b (diff)
am 09979bcf: am fd34aa8e: am 5644d0e1: Support for NDEF on iCODE.
* commit '09979bcf730e7df033ab0d8cadf564873c7e624b': Support for NDEF on iCODE.
-rw-r--r--core/java/android/nfc/tech/Ndef.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/nfc/tech/Ndef.java b/core/java/android/nfc/tech/Ndef.java
index 6727d6ad5090..e4daa5782188 100644
--- a/core/java/android/nfc/tech/Ndef.java
+++ b/core/java/android/nfc/tech/Ndef.java
@@ -103,6 +103,8 @@ public final class Ndef extends BasicTagTechnology {
public static final int TYPE_4 = 4;
/** @hide */
public static final int TYPE_MIFARE_CLASSIC = 101;
+ /** @hide */
+ public static final int TYPE_ICODE_SLI = 102;
/** @hide */
public static final String UNKNOWN = "android.ndef.unknown";
@@ -117,6 +119,11 @@ public final class Ndef extends BasicTagTechnology {
public static final String NFC_FORUM_TYPE_4 = "org.nfcforum.ndef.type4";
/** NDEF on MIFARE Classic */
public static final String MIFARE_CLASSIC = "com.nxp.ndef.mifareclassic";
+ /**
+ * NDEF on iCODE SLI
+ * @hide
+ */
+ public static final String ICODE_SLI = "com.nxp.ndef.icodesli";
private final int mMaxNdefSize;
private final int mCardState;
@@ -200,6 +207,8 @@ public final class Ndef extends BasicTagTechnology {
return NFC_FORUM_TYPE_4;
case TYPE_MIFARE_CLASSIC:
return MIFARE_CLASSIC;
+ case TYPE_ICODE_SLI:
+ return ICODE_SLI;
default:
return UNKNOWN;
}