diff options
| author | Ruchi Kandoi <kandoiruchi@google.com> | 2018-02-04 00:44:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-04 00:44:02 +0000 |
| commit | 01de0a82ccd2f57928f1eff34492423d4196178d (patch) | |
| tree | 6dafcd215f541cb14633abd571f45fd703d016a7 /core/java | |
| parent | b49b3f1e57784c2d00ee66aac247f64bcc92257e (diff) | |
| parent | 9750a6f69a7cfc764675df8f33a4dc9c6ac44293 (diff) | |
Merge "Add NFC Transaction Event intent actions and extras" am: 337e2feada am: 8b35111d3e
am: 9750a6f69a
Change-Id: I8c9f734f8e51ecae23cb225a4295e1b6b63be307
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/nfc/NfcAdapter.java | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index debef6310f14..b02d48dc438f 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -147,6 +147,19 @@ public final class NfcAdapter { public static final String ACTION_TAG_DISCOVERED = "android.nfc.action.TAG_DISCOVERED"; /** + * Broadcast Action: Intent to notify an application that an transaction event has occurred + * on the Secure Element. + * + * <p>This intent will only be sent if the application has requested permission for + * {@link android.Manifest.permission#NFC_TRANSACTION_EVENT} and if the application has the + * necessary access to Secure Element which witnessed the particular event. + */ + @RequiresPermission(android.Manifest.permission.NFC_TRANSACTION_EVENT) + @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) + public static final String ACTION_TRANSACTION_DETECTED = + "android.nfc.action.TRANSACTION_DETECTED"; + + /** * Broadcast to only the activity that handles ACTION_TAG_DISCOVERED * @hide */ @@ -197,6 +210,23 @@ public final class NfcAdapter { */ public static final String EXTRA_ADAPTER_STATE = "android.nfc.extra.ADAPTER_STATE"; + /** + * Mandatory byte[] extra field in {@link #ACTION_TRANSACTION_DETECTED} + */ + public static final String EXTRA_AID = "android.nfc.extra.AID"; + + /** + * Optional byte[] extra field in {@link #ACTION_TRANSACTION_DETECTED} + */ + public static final String EXTRA_DATA = "android.nfc.extra.DATA"; + + /** + * Mandatory String extra field in {@link #ACTION_TRANSACTION_DETECTED} + * 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 int STATE_OFF = 1; public static final int STATE_TURNING_ON = 2; public static final int STATE_ON = 3; |