diff options
| author | 2018-03-20 17:23:59 +0000 | |
|---|---|---|
| committer | 2018-03-20 17:23:59 +0000 | |
| commit | c6d6f55ec4850642bb80d42a4f7165ff07d2a0fe (patch) | |
| tree | 4ba3327b19ae7dc84ca3ddb23ec680342d4859eb | |
| parent | 7a4a3599128478fa930b0a623130157a4def9412 (diff) | |
| parent | 14a8b1e318073b1608499195477b51b4723e74e6 (diff) | |
Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME" into pi-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/nfc/NfcAdapter.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 414491cd57b7..53401e59e2c1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -29475,7 +29475,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 diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index b02d48dc438f..c3f23a1cca9f 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -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; |