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

am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2

Browse Source 
* commit '14019abb40785064ebef5d14e82586a910d33181':
  Swap Mifare for MIFARE.
This commit is contained in:
Jeff Hamilton
2011-05-25 15:41:51 -07:00
committed by Android Git Automerger
parent a2a605a958 14019abb40
commit 5e654d0245
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/nfc/tech/MifareClassic.java
View File

@@ -82,12 +82,12 @@ public final class MifareClassic extends BasicTagTechnology {
{(byte)0xA0,(byte)0xA1,(byte)0xA2,(byte)0xA3,(byte)0xA4,(byte)0xA5}; {(byte)0xA0,(byte)0xA1,(byte)0xA2,(byte)0xA3,(byte)0xA4,(byte)0xA5};
/** /**
* The well-known key for tags formatted according to the * The well-known key for tags formatted according to the
* NDEF on Mifare Classic specification. * NDEF on MIFARE Classic specification.
*/ */
public static final byte[] KEY_NFC_FORUM = public static final byte[] KEY_NFC_FORUM =
{(byte)0xD3,(byte)0xF7,(byte)0xD3,(byte)0xF7,(byte)0xD3,(byte)0xF7}; {(byte)0xD3,(byte)0xF7,(byte)0xD3,(byte)0xF7,(byte)0xD3,(byte)0xF7};
/** A Mifare Classic compatible card of unknown type */ /** A MIFARE Classic compatible card of unknown type */
public static final int TYPE_UNKNOWN = -1; public static final int TYPE_UNKNOWN = -1;
/** A MIFARE Classic tag */ /** A MIFARE Classic tag */
public static final int TYPE_CLASSIC = 0; public static final int TYPE_CLASSIC = 0;
@@ -141,7 +141,7 @@ public final class MifareClassic extends BasicTagTechnology {
public MifareClassic(Tag tag) throws RemoteException { public MifareClassic(Tag tag) throws RemoteException {
super(tag, TagTechnology.MIFARE_CLASSIC); super(tag, TagTechnology.MIFARE_CLASSIC);
NfcA a = NfcA.get(tag); // Mifare Classic is always based on NFC a NfcA a = NfcA.get(tag); // MIFARE Classic is always based on NFC a
mIsEmulated = false; mIsEmulated = false;
@@ -192,7 +192,7 @@ public final class MifareClassic extends BasicTagTechnology {
// Stack incorrectly reported a MifareClassic. We cannot handle this // Stack incorrectly reported a MifareClassic. We cannot handle this
// gracefully - we have no idea of the memory layout. Bail. // gracefully - we have no idea of the memory layout. Bail.
throw new RuntimeException( throw new RuntimeException(
"Tag incorrectly enumerated as Mifare Classic, SAK = " + a.getSak()); "Tag incorrectly enumerated as MIFARE Classic, SAK = " + a.getSak());
} }
} }
@@ -221,8 +221,8 @@ public final class MifareClassic extends BasicTagTechnology {
/** /**
* Return true if the tag is emulated, determined at discovery time. * Return true if the tag is emulated, determined at discovery time.
* These are actually smart-cards that emulate a Mifare Classic interface. * These are actually smart-cards that emulate a MIFARE Classic interface.
* They can be treated identically to a Mifare Classic tag. * They can be treated identically to a MIFARE Classic tag.
* @hide * @hide
*/ */
public boolean isEmulated() { public boolean isEmulated() {
@@ -571,8 +571,8 @@ public final class MifareClassic extends BasicTagTechnology {
private static void validateSector(int sector) { private static void validateSector(int sector) {
// Do not be too strict on upper bounds checking, since some cards // Do not be too strict on upper bounds checking, since some cards
// have more addressable memory than they report. For example, // have more addressable memory than they report. For example,
// Mifare Plus 2k cards will appear as Mifare Classic 1k cards when in // MIFARE Plus 2k cards will appear as MIFARE Classic 1k cards when in
// Mifare Classic compatibility mode. // MIFARE Classic compatibility mode.
// Note that issuing a command to an out-of-bounds block is safe - the // Note that issuing a command to an out-of-bounds block is safe - the
// tag should report error causing IOException. This validation is a // tag should report error causing IOException. This validation is a
// helper to guard against obvious programming mistakes. // helper to guard against obvious programming mistakes.

2
core/java/android/nfc/tech/MifareUltralight.java
View File

@@ -95,7 +95,7 @@ public final class MifareUltralight extends BasicTagTechnology {
public MifareUltralight(Tag tag) throws RemoteException { public MifareUltralight(Tag tag) throws RemoteException {
super(tag, TagTechnology.MIFARE_ULTRALIGHT); super(tag, TagTechnology.MIFARE_ULTRALIGHT);
// Check if this could actually be a Mifare // Check if this could actually be a MIFARE
NfcA a = NfcA.get(tag); NfcA a = NfcA.get(tag);
mType = TYPE_UNKNOWN; mType = TYPE_UNKNOWN;

4
docs/html/sdk/android-2.3.3.jd
View File

@@ -141,8 +141,8 @@ to a wider range of standard tag technologies, including:</p>
<li>NFC-F (JIS 6319-4)</li> <li>NFC-F (JIS 6319-4)</li>
<li>NFC-V (ISO 15693)</li> <li>NFC-V (ISO 15693)</li>
<li>ISO-DEP (ISO 14443-4)</li> <li>ISO-DEP (ISO 14443-4)</li>
<li>Mifare Classic</li> <li>MIFARE Classic</li>
<li>Mifare Ultralight</li> <li>MIFARE Ultralight</li>
<li>NFC Forum NDEF tags</li> <li>NFC Forum NDEF tags</li>
</ul> </ul>