Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread

Browse Source
This commit is contained in:
Nick Pelly
2011-01-03 22:32:56 -08:00
committed by Android (Google) Code Review
parent 163bd40749 ddbb2c997b
commit a743448a1b
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/java/android/nfc/technology/Ndef.java
View File

@@ -57,12 +57,14 @@ public final class Ndef extends BasicTagTechnology {
/** @hide */ /** @hide */
public static final String EXTRA_NDEF_TYPE = "ndeftype"; public static final String EXTRA_NDEF_TYPE = "ndeftype";
public static final int UNKNOWN_TAG = 0; //TODO: consider removing OTHER entirely - and not allowing Ndef to
public static final int TYPE1_TAG = 1; // enumerate for tag types outside of (NFC Forum 1-4, MifareClassic)
public static final int TYPE2_TAG = 2; public static final int OTHER = -1;
public static final int TYPE3_TAG = 3; public static final int NFC_FORUM_TYPE_1 = 1;
public static final int TYPE4_TAG = 4; public static final int NFC_FORUM_TYPE_2 = 2;
public static final int MIFARE_CLASSIC_TAG = 5; public static final int NFC_FORUM_TYPE_3 = 3;
public static final int NFC_FORUM_TYPE_4 = 4;
public static final int MIFARE_CLASSIC = 105;
private final int mMaxNdefSize; private final int mMaxNdefSize;
private final int mCardState; private final int mCardState;
@@ -104,7 +106,18 @@ public final class Ndef extends BasicTagTechnology {
} }
/** /**
* Get NDEF card type * Get NDEF tag type.
* <p>Returns one of {@link #NFC_FORUM_TYPE_1}, {@link #NFC_FORUM_TYPE_2},
* {@link #NFC_FORUM_TYPE_3}, {@link #NFC_FORUM_TYPE_4},
* {@link #MIFARE_CLASSIC} or {@link #OTHER}.
* <p>Platforms of this API revision will always return one of the above
* values. Platforms at future API revisions may return other values, which
* can be treated as {@link #OTHER} by applications targeting this API.
* <p>Android devices with NFC support must always correctly enumerate
* NFC Forum tag types, and may optionally enumerate
* {@link #MIFARE_CLASSIC} since it requires proprietary technology.
* Devices that cannot enumerate {@link #MIFARE_CLASSIC} will use
* {@link #OTHER} instead.
*/ */
public int getType() { public int getType() {
return mNdefType; return mNdefType;