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

Commit eb267c63 authored by Brad Lassey's avatar Brad Lassey
Browse files

Rename bundle keys to be prefixed with KEY 

Bug: b/314960915
Test: Built locally
Change-Id: I1a5f639846b1df83d0fb3308ede1a2ebbd2924a0
parent 50004872

nfc/api/current.txt

+4 −4
Original line number Original line Diff line number Diff line
@@ -232,13 +232,13 @@ package android.nfc.cardemulation { 
    method public final void sendResponseApdu(byte[]);

    method public final void sendResponseApdu(byte[]);

    field public static final int DEACTIVATION_DESELECTED = 1; // 0x1

    field public static final int DEACTIVATION_DESELECTED = 1; // 0x1

    field public static final int DEACTIVATION_LINK_LOSS = 0; // 0x0

    field public static final int DEACTIVATION_LINK_LOSS = 0; // 0x0

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final String POLLING_LOOP_DATA_KEY = "android.nfc.cardemulation.DATA";

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final String KEY_POLLING_LOOP_DATA = "android.nfc.cardemulation.DATA";

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final String POLLING_LOOP_GAIN_KEY = "android.nfc.cardemulation.GAIN";

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final String KEY_POLLING_LOOP_GAIN = "android.nfc.cardemulation.GAIN";

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final String POLLING_LOOP_TIMESTAMP_KEY = "android.nfc.cardemulation.TIMESTAMP";

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final String KEY_POLLING_LOOP_TIMESTAMP = "android.nfc.cardemulation.TIMESTAMP";

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final String KEY_POLLING_LOOP_TYPE = "android.nfc.cardemulation.TYPE";

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final char POLLING_LOOP_TYPE_A = 65; // 0x0041 'A'

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final char POLLING_LOOP_TYPE_A = 65; // 0x0041 'A'

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final char POLLING_LOOP_TYPE_B = 66; // 0x0042 'B'

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final char POLLING_LOOP_TYPE_B = 66; // 0x0042 'B'

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final char POLLING_LOOP_TYPE_F = 70; // 0x0046 'F'

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final char POLLING_LOOP_TYPE_F = 70; // 0x0046 'F'

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final String POLLING_LOOP_TYPE_KEY = "android.nfc.cardemulation.TYPE";

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final char POLLING_LOOP_TYPE_OFF = 88; // 0x0058 'X'

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final char POLLING_LOOP_TYPE_OFF = 88; // 0x0058 'X'

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final char POLLING_LOOP_TYPE_ON = 79; // 0x004f 'O'

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final char POLLING_LOOP_TYPE_ON = 79; // 0x004f 'O'

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final char POLLING_LOOP_TYPE_UNKNOWN = 85; // 0x0055 'U'

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final char POLLING_LOOP_TYPE_UNKNOWN = 85; // 0x0055 'U'

nfc/java/android/nfc/cardemulation/HostApduService.java

+10 −10
Original line number Original line Diff line number Diff line
@@ -244,11 +244,11 @@ public abstract class HostApduService extends Service { 
    public static final String KEY_DATA = "data";

    public static final String KEY_DATA = "data";





    /**

    /**

     * POLLING_LOOP_TYPE_KEY is the Bundle key for the type of

     * KEY_POLLING_LOOP_TYPE is the Bundle key for the type of

     * polling loop frame in the Bundle passed to {@link #processPollingFrames(List)}

     * polling loop frame in the Bundle passed to {@link #processPollingFrames(List)}

     */

     */

    @FlaggedApi(android.nfc.Flags.FLAG_NFC_READ_POLLING_LOOP)

    @FlaggedApi(android.nfc.Flags.FLAG_NFC_READ_POLLING_LOOP)

    public static final String POLLING_LOOP_TYPE_KEY = "android.nfc.cardemulation.TYPE";

    public static final String KEY_POLLING_LOOP_TYPE = "android.nfc.cardemulation.TYPE";





    /**

    /**

     * POLLING_LOOP_TYPE_A is the value associated with the key

     * POLLING_LOOP_TYPE_A is the value associated with the key
@@ -299,33 +299,33 @@ public abstract class HostApduService extends Service { 
    public static final char POLLING_LOOP_TYPE_UNKNOWN = 'U';

    public static final char POLLING_LOOP_TYPE_UNKNOWN = 'U';





    /**

    /**

     * POLLING_LOOP_DATA is the Bundle key for the raw data of captured from

     * KEY_POLLING_LOOP_DATA is the Bundle key for the raw data of captured from

     * the polling loop frame in the Bundle passed to {@link #processPollingFrames(List)}

     * the polling loop frame in the Bundle passed to {@link #processPollingFrames(List)}

     * when the frame type isn't recognized.

     * when the frame type isn't recognized.

     */

     */

    @FlaggedApi(android.nfc.Flags.FLAG_NFC_READ_POLLING_LOOP)

    @FlaggedApi(android.nfc.Flags.FLAG_NFC_READ_POLLING_LOOP)

    public static final String POLLING_LOOP_DATA_KEY = "android.nfc.cardemulation.DATA";

    public static final String KEY_POLLING_LOOP_DATA = "android.nfc.cardemulation.DATA";





    /**

    /**

     * POLLING_LOOP_GAIN_KEY is the Bundle key for the field strength of

     * KEY_POLLING_LOOP_GAIN is the Bundle key for the field strength of

     * the polling loop frame in the Bundle passed to {@link #processPollingFrames(List)}

     * the polling loop frame in the Bundle passed to {@link #processPollingFrames(List)}

     * when the frame type isn't recognized.

     * when the frame type isn't recognized.

     */

     */

    @FlaggedApi(android.nfc.Flags.FLAG_NFC_READ_POLLING_LOOP)

    @FlaggedApi(android.nfc.Flags.FLAG_NFC_READ_POLLING_LOOP)

    public static final String POLLING_LOOP_GAIN_KEY = "android.nfc.cardemulation.GAIN";

    public static final String KEY_POLLING_LOOP_GAIN = "android.nfc.cardemulation.GAIN";





    /**

    /**

     * POLLING_LOOP_TIMESTAMP_KEY is the Bundle key for the timestamp of

     * KEY_POLLING_LOOP_TIMESTAMP is the Bundle key for the timestamp of

     * the polling loop frame in the Bundle passed to {@link #processPollingFrames(List)}

     * the polling loop frame in the Bundle passed to {@link #processPollingFrames(List)}

     * when the frame type isn't recognized.

     * when the frame type isn't recognized.

     */

     */

    @FlaggedApi(android.nfc.Flags.FLAG_NFC_READ_POLLING_LOOP)

    @FlaggedApi(android.nfc.Flags.FLAG_NFC_READ_POLLING_LOOP)

    public static final String POLLING_LOOP_TIMESTAMP_KEY = "android.nfc.cardemulation.TIMESTAMP";

    public static final String KEY_POLLING_LOOP_TIMESTAMP = "android.nfc.cardemulation.TIMESTAMP";





    /**

    /**

     * @hide

     * @hide

     */

     */

    public static final String POLLING_LOOP_FRAMES_BUNDLE_KEY =

    public static final String KEY_POLLING_LOOP_FRAMES_BUNDLE =

            "android.nfc.cardemulation.POLLING_FRAMES";

            "android.nfc.cardemulation.POLLING_FRAMES";





    /**

    /**
@@ -405,7 +405,7 @@ public abstract class HostApduService extends Service { 
                break;

                break;

                case MSG_POLLING_LOOP:

                case MSG_POLLING_LOOP:

                    ArrayList<Bundle> frames =

                    ArrayList<Bundle> frames =

                            msg.getData().getParcelableArrayList(POLLING_LOOP_FRAMES_BUNDLE_KEY,

                            msg.getData().getParcelableArrayList(KEY_POLLING_LOOP_FRAMES_BUNDLE,

                            Bundle.class);

                            Bundle.class);

                    processPollingFrames(frames);

                    processPollingFrames(frames);

                    break;

                    break;