Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72df4ea8 authored by Martijn Coenen's avatar Martijn Coenen Committed by Jeff Hamilton
Browse files

Remove Type X Tags from the top-level API. 

Also added an extra to carry the ndef message, so we can have it in multiple
Ndef instances without doing an active read.

Change-Id: I2ecabc24732990c5c9979ee3a001a7fb13da21d9
parent 47e6ccb6

core/java/android/nfc/Tag.java

+1 −5
Original line number Diff line number Diff line
@@ -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: {

core/java/android/nfc/technology/Ndef.java

+3 −0
Original line number Diff line number Diff line
@@ -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

core/java/android/nfc/technology/TagTechnology.java

+1 −16
Original line number Diff line number Diff line
@@ -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}