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

Merge "Remove Type X Tags from the top-level API." into gingerbread

Browse Source
This commit is contained in:
Jeff Hamilton
2010-12-07 13:59:29 -08:00
committed by Android (Google) Code Review
parent f340d082b8 72df4ea830
commit 0f74afbbf4
3 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/nfc/Tag.java
View File

@@ -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: {

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

@@ -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

17
core/java/android/nfc/technology/TagTechnology.java
View File

@@ -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}