diff options
| author | Jeff Hamilton <jham@google.com> | 2010-12-07 17:23:56 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-07 17:23:56 -0800 |
| commit | 2460a5fa23ca36b91f5759d49339911461833c2d (patch) | |
| tree | 9a19250552b512d21e626bfab5386c75eb154059 | |
| parent | 47fc765540b954550bf79a89a633f0f173939d7f (diff) | |
| parent | 03dc51b1a07c7d79f1d12751b19ebda044857333 (diff) | |
| download | frameworks_base-2460a5fa23ca36b91f5759d49339911461833c2d.zip frameworks_base-2460a5fa23ca36b91f5759d49339911461833c2d.tar.gz frameworks_base-2460a5fa23ca36b91f5759d49339911461833c2d.tar.bz2 | |
am 03dc51b1: am 0f74afbb: Merge "Remove Type X Tags from the top-level API." into gingerbread
* commit '03dc51b1a07c7d79f1d12751b19ebda044857333':
Remove Type X Tags from the top-level API.
| -rw-r--r-- | core/java/android/nfc/Tag.java | 6 | ||||
| -rw-r--r-- | core/java/android/nfc/technology/Ndef.java | 3 | ||||
| -rw-r--r-- | core/java/android/nfc/technology/TagTechnology.java | 17 |
3 files changed, 5 insertions, 21 deletions
diff --git a/core/java/android/nfc/Tag.java b/core/java/android/nfc/Tag.java index ad05496..2f6b3a5 100644 --- a/core/java/android/nfc/Tag.java +++ b/core/java/android/nfc/Tag.java @@ -154,11 +154,7 @@ public class Tag implements Parcelable { case TagTechnology.NFC_V: { return new NfcV(adapter, this, extras); } - case TagTechnology.MIFARE_CLASSIC_NDEF: - case TagTechnology.TYPE_1: - case TagTechnology.TYPE_2: - case TagTechnology.TYPE_3: - case TagTechnology.TYPE_4: { + case TagTechnology.NDEF: { return new Ndef(adapter, this, tech, extras); } case TagTechnology.NFC_F: { diff --git a/core/java/android/nfc/technology/Ndef.java b/core/java/android/nfc/technology/Ndef.java index 22460cf..1e3da2a 100644 --- a/core/java/android/nfc/technology/Ndef.java +++ b/core/java/android/nfc/technology/Ndef.java @@ -44,6 +44,9 @@ public final class Ndef extends BasicTagTechnology { public static final int NDEF_MODE_WRITE_MANY = 4; public static final int NDEF_MODE_UNKNOWN = 5; + /** @hide */ + public static final String EXTRA_NDEF_MSG = "ndefmsg"; + /** * Internal constructor, to be used by NfcAdapter * @hide diff --git a/core/java/android/nfc/technology/TagTechnology.java b/core/java/android/nfc/technology/TagTechnology.java index 9dfb297..4704f2b 100644 --- a/core/java/android/nfc/technology/TagTechnology.java +++ b/core/java/android/nfc/technology/TagTechnology.java @@ -49,22 +49,7 @@ public interface TagTechnology { /** * This object is an instance of {@link Ndef} */ - public static final int TYPE_1 = 101; - - /** - * This object is an instance of {@link Ndef} - */ - public static final int TYPE_2 = 102; - - /** - * This object is an instance of {@link Ndef} - */ - public static final int TYPE_3 = 103; - - /** - * This object is an instance of {@link Ndef} - */ - public static final int TYPE_4 = 104; + public static final int NDEF = 101; /** * This object is an instance of {@link NdefFormatable} |