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

Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME"

Browse Source 
am: 01cef932c8

Change-Id: Ic8c8b5566a4278af7ecf745d4b3c8d18a1d848b7
This commit is contained in:
Ruchi Kandoi
2018-03-16 21:28:18 +00:00
committed by android-build-merger
parent 6c54d8509a 01cef932c8
commit 7ad52283ab
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -27546,7 +27546,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

2
core/java/android/nfc/NfcAdapter.java
View File

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