diff options
| author | Nick Pelly <npelly@google.com> | 2010-12-07 09:34:47 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-07 09:34:47 -0800 |
| commit | 8c30a47d801be50272098e60d0079ae1b4ebd22a (patch) | |
| tree | d625d40cce97115eff57d75f344e31838c651d41 | |
| parent | c9cc9ab590ef879877e466c0b5f5823e11bb4c47 (diff) | |
| parent | 47e6ccb65ab0088cf04809c234cdb5f747579c8c (diff) | |
| download | frameworks_base-8c30a47d801be50272098e60d0079ae1b4ebd22a.zip frameworks_base-8c30a47d801be50272098e60d0079ae1b4ebd22a.tar.gz frameworks_base-8c30a47d801be50272098e60d0079ae1b4ebd22a.tar.bz2 | |
am 47e6ccb6: Merge "Corrected MIFARE default key set" into gingerbread
* commit '47e6ccb65ab0088cf04809c234cdb5f747579c8c':
Corrected MIFARE default key set
| -rw-r--r-- | core/java/android/nfc/technology/MifareClassic.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/core/java/android/nfc/technology/MifareClassic.java b/core/java/android/nfc/technology/MifareClassic.java index c25b71f..ba3a425 100644 --- a/core/java/android/nfc/technology/MifareClassic.java +++ b/core/java/android/nfc/technology/MifareClassic.java @@ -36,23 +36,21 @@ import java.io.IOException; */ public final class MifareClassic extends BasicTagTechnology { /** - * The well-known, default factory MIFARE read key. + * The well-known, default MIFARE read key. * Use this key to effectively make the payload in this sector * public. */ - public static final byte[] DEFAULT_KEY_FACTORY = + public static final byte[] KEY_DEFAULT = {(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0xFF}; - public static final byte[] DEFAULT_KEY_ZERO = - {(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00}; /** * The well-known, default Mifare Application Directory read key. */ - public static final byte[] DEFAULT_KEY_MAD = + public static final byte[] KEY_MIFARE_APPLICATION_DIRECTORY = {(byte)0xA0,(byte)0xA1,(byte)0xA2,(byte)0xA3,(byte)0xA4,(byte)0xA5}; /** * The well-known, default read key for NDEF data on a Mifare Classic */ - public static final byte[] DEFAULT_KEY_NFC_FORUM = + public static final byte[] KEY_NFC_FORUM = {(byte)0xD3,(byte)0xF7,(byte)0xD3,(byte)0xF7,(byte)0xD3,(byte)0xF7}; public static final int TYPE_CLASSIC = 0; |