am 7c324a3f: am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2 (e00ef008) · Commits · e / os / android_frameworks_base

core/java/android/nfc/tech/MifareClassic.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -82,12 +82,12 @@ public final class MifareClassic extends BasicTagTechnology {
		{(byte)0xA0,(byte)0xA1,(byte)0xA2,(byte)0xA3,(byte)0xA4,(byte)0xA5};
		/**
		* 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 =
		{(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;
		/** A MIFARE Classic tag */
		public static final int TYPE_CLASSIC = 0;
		@@ -141,7 +141,7 @@ public final class MifareClassic extends BasicTagTechnology {
		public MifareClassic(Tag tag) throws RemoteException {
		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;

		@@ -192,7 +192,7 @@ public final class MifareClassic extends BasicTagTechnology {
		// Stack incorrectly reported a MifareClassic. We cannot handle this
		// gracefully - we have no idea of the memory layout. Bail.
		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.
		* These are actually smart-cards that emulate a Mifare Classic interface.
		* They can be treated identically to a Mifare Classic tag.
		* These are actually smart-cards that emulate a MIFARE Classic interface.
		* They can be treated identically to a MIFARE Classic tag.
		* @hide
		*/
		public boolean isEmulated() {
		@@ -571,8 +571,8 @@ public final class MifareClassic extends BasicTagTechnology {
		private static void validateSector(int sector) {
		// Do not be too strict on upper bounds checking, since some cards
		// have more addressable memory than they report. For example,
		// Mifare Plus 2k cards will appear as Mifare Classic 1k cards when in
		// Mifare Classic compatibility mode.
		// MIFARE Plus 2k cards will appear as MIFARE Classic 1k cards when in
		// MIFARE Classic compatibility mode.
		// Note that issuing a command to an out-of-bounds block is safe - the
		// tag should report error causing IOException. This validation is a
		// helper to guard against obvious programming mistakes.

core/java/android/nfc/tech/MifareUltralight.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ public final class MifareUltralight extends BasicTagTechnology {
		public MifareUltralight(Tag tag) throws RemoteException {
		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);

		mType = TYPE_UNKNOWN;

docs/html/sdk/android-2.3.3.jd

+2 −2

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