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

Commit a3180099 authored by Ruchi Kandoi's avatar Ruchi Kandoi Committed by android-build-merger
Browse files

Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME" am: 01cef932 

am: 7ad52283

Change-Id: I4cdeed1b3b55de95e58c8784e379ccfe9da7e4d8
parents d3332bbc 7ad52283

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -29469,7 +29469,7 @@ package android.nfc { 
    field public static final java.lang.String EXTRA_ID = "android.nfc.extra.ID";

    field public static final java.lang.String EXTRA_NDEF_MESSAGES = "android.nfc.extra.NDEF_MESSAGES";

    field public static final java.lang.String EXTRA_READER_PRESENCE_CHECK_DELAY = "presence";

    field public static final java.lang.String EXTRA_SE_NAME = "android.nfc.extra.SE_NAME";

    field public static final java.lang.String EXTRA_SECURE_ELEMENT_NAME = "android.nfc.extra.SECURE_ELEMENT_NAME";

    field public static final java.lang.String EXTRA_TAG = "android.nfc.extra.TAG";

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

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

core/java/android/nfc/NfcAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ public final class NfcAdapter { 
     * Indicates the Secure Element on which the transaction occurred.

     * eSE1...eSEn for Embedded Secure Elements, SIM1...SIMn for UICC, etc.

     */

    public static final String EXTRA_SE_NAME = "android.nfc.extra.SE_NAME";

    public static final String EXTRA_SECURE_ELEMENT_NAME = "android.nfc.extra.SECURE_ELEMENT_NAME";



    public static final int STATE_OFF = 1;

    public static final int STATE_TURNING_ON = 2;