diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-20 03:39:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-20 03:39:40 +0000 |
| commit | 43b5abeec2f60625fe4a356b9bc99983812586da (patch) | |
| tree | 15b9d655bc47bbe61ea3c708b6df3f4014b9cab8 /core/java/android/nfc/NfcAdapter.java | |
| parent | baa2cea8c362d54e763be5b316e5fbd8bcd3fc28 (diff) | |
| parent | b70662d510ce70c1d9d0e796067c3ca8a4a3ab5c (diff) | |
Merge "Provide APIs to get preferred payment service information" am: c0c28a2671 am: e7bfadcb7d am: b70662d510
Change-Id: I3518a47aaa544962e52b12db3a01fc55802a9faf
Diffstat (limited to 'core/java/android/nfc/NfcAdapter.java')
| -rw-r--r-- | core/java/android/nfc/NfcAdapter.java | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index 5715c9ab43a5..d320f61a3657 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -164,6 +164,18 @@ public final class NfcAdapter { "android.nfc.action.TRANSACTION_DETECTED"; /** + * Broadcast Action: Intent to notify if the preferred payment service changed. + * + * <p>This intent will only be sent to the application has requested permission for + * {@link android.Manifest.permission#NFC_PREFERRED_PAYMENT_INFO} and if the application + * has the necessary access to Secure Element which witnessed the particular event. + */ + @RequiresPermission(android.Manifest.permission.NFC_PREFERRED_PAYMENT_INFO) + @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) + public static final String ACTION_PREFERRED_PAYMENT_CHANGED = + "android.nfc.action.PREFERRED_PAYMENT_CHANGED"; + + /** * Broadcast to only the activity that handles ACTION_TAG_DISCOVERED * @hide */ @@ -231,6 +243,17 @@ public final class NfcAdapter { */ public static final String EXTRA_SECURE_ELEMENT_NAME = "android.nfc.extra.SECURE_ELEMENT_NAME"; + /** + * Mandatory String extra field in {@link #ACTION_PREFERRED_PAYMENT_CHANGED} + * Indicates the condition when trigger this event. + */ + public static final String EXTRA_PREFERRED_PAYMENT_CHANGED_REASON = + "android.nfc.extra.PREFERRED_PAYMENT_CHANGED_REASON"; + + public static final int PREFERRED_PAYMENT_LOADED = 1; + public static final int PREFERRED_PAYMENT_CHANGED = 2; + public static final int PREFERRED_PAYMENT_UPDATED = 3; + public static final int STATE_OFF = 1; public static final int STATE_TURNING_ON = 2; public static final int STATE_ON = 3; @@ -1410,7 +1433,7 @@ public final class NfcAdapter { /** * Enable foreground dispatch to the given Activity. * - * <p>This will give give priority to the foreground activity when + * <p>This will give priority to the foreground activity when * dispatching a discovered {@link Tag} to an application. * * <p>If any IntentFilters are provided to this method they are used to match dispatch Intents |