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

Commit 5f77cb67 authored by Alisher Alikhodjaev's avatar Alisher Alikhodjaev
Browse files

API review comments for b/364120337 addressed 

Bug: 380857923
Test: atest -c CtsNfcTestCases
Change-Id: I5ffa3690b0441fc5846fe7773ccda40984c98583
parent af71583a

nfc/api/system-current.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -85,6 +85,10 @@ package android.nfc { 
    field public static final int HCE_ACTIVATE = 1; // 0x1

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

    field public static final int HCE_DATA_TRANSFERRED = 2; // 0x2

    field public static final int HCE_DATA_TRANSFERRED = 2; // 0x2

    field public static final int HCE_DEACTIVATE = 3; // 0x3

    field public static final int HCE_DEACTIVATE = 3; // 0x3

    field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int NFCEE_TECH_A = 1; // 0x1

    field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int NFCEE_TECH_B = 2; // 0x2

    field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int NFCEE_TECH_F = 4; // 0x4

    field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int NFCEE_TECH_NONE = 0; // 0x0

    field public static final int POLLING_STATE_CHANGE_ALREADY_IN_REQUESTED_STATE = 2; // 0x2

    field public static final int POLLING_STATE_CHANGE_ALREADY_IN_REQUESTED_STATE = 2; // 0x2

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

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

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

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

nfc/java/android/nfc/NfcOemExtension.java

+7 −8
Original line number Original line Diff line number Diff line
@@ -150,28 +150,24 @@ public final class NfcOemExtension { 




    /**

    /**

     * Technology Type for {@link #getActiveNfceeList()}.

     * Technology Type for {@link #getActiveNfceeList()}.

     * @hide

     */

     */

    @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION)

    @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION)

    public static final int NFCEE_TECH_NONE = 0;

    public static final int NFCEE_TECH_NONE = 0;





    /**

    /**

     * Technology Type for {@link #getActiveNfceeList()}.

     * Technology Type for {@link #getActiveNfceeList()}.

     * @hide

     */

     */

    @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION)

    @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION)

    public static final int NFCEE_TECH_A = 1;

    public static final int NFCEE_TECH_A = 1;





    /**

    /**

     * Technology Type for {@link #getActiveNfceeList()}.

     * Technology Type for {@link #getActiveNfceeList()}.

     * @hide

     */

     */

    @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION)

    @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION)

    public static final int NFCEE_TECH_B = 1 << 1;

    public static final int NFCEE_TECH_B = 1 << 1;





    /**

    /**

     * Technology Type for {@link #getActiveNfceeList()}.

     * Technology Type for {@link #getActiveNfceeList()}.

     * @hide

     */

     */

    @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION)

    @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION)

    public static final int NFCEE_TECH_F = 1 << 2;

    public static final int NFCEE_TECH_F = 1 << 2;
@@ -670,12 +666,15 @@ public final class NfcOemExtension { 
    /**

    /**

     * Get the Active NFCEE (NFC Execution Environment) List

     * Get the Active NFCEE (NFC Execution Environment) List

     *

     *

     * @see Reader#getName() for the list of possible NFCEE names.

     *

     * @return Map< String, @NfceeTechnology Integer >

     * @return Map< String, @NfceeTechnology Integer >

     *         A HashMap where keys are activated secure elements and

     *         A HashMap where keys are activated secure elements and

     *         the values are bitmap of technologies supported by each secure element

     *         the values are bitmap of technologies supported by each secure element:

     *         on success keys can contain "eSE" and "UICC", otherwise empty map.

     *          NFCEE_TECH_A == 0x1

     *          NFCEE_TECH_B == 0x2

     *          NFCEE_TECH_F == 0x4

     *         and keys can contain "eSE" and "SIM" with a number,

     *         in case of failure an empty map is returned.

     *         @see Reader#getName() for the list of possible NFCEE names.

     */

     */

    @NonNull

    @NonNull

    @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION)

    @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION)