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

Merge "Add NFC Transaction Event intent actions and extras" am: 337e2feada

Browse Source 
am: 8b35111d3e

Change-Id: Icedc6764b7b3fdf9b5706bedc3e4fe0dc0d39c58
This commit is contained in:
Ruchi Kandoi
2018-02-02 22:13:27 +00:00
committed by android-build-merger
parent c8cb3aad58 8b35111d3e
commit 9750a6f69a
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -27545,10 +27545,14 @@ package android.nfc {
field public static final java.lang.String ACTION_NDEF_DISCOVERED = "android.nfc.action.NDEF_DISCOVERED";
field public static final java.lang.String ACTION_TAG_DISCOVERED = "android.nfc.action.TAG_DISCOVERED";
field public static final java.lang.String ACTION_TECH_DISCOVERED = "android.nfc.action.TECH_DISCOVERED";
field public static final java.lang.String ACTION_TRANSACTION_DETECTED = "android.nfc.action.TRANSACTION_DETECTED";
field public static final java.lang.String EXTRA_ADAPTER_STATE = "android.nfc.extra.ADAPTER_STATE";
field public static final java.lang.String EXTRA_AID = "android.nfc.extra.AID";
field public static final java.lang.String EXTRA_DATA = "android.nfc.extra.DATA";
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_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

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

@@ -146,6 +146,19 @@ public final class NfcAdapter {
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
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;