diff options
| author | Martijn Coenen <maco@google.com> | 2014-05-08 23:37:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-08 23:37:00 +0000 |
| commit | 66f29aa4a5869a628e45e715f6fc45dc79b55c95 (patch) | |
| tree | 604224e6e30bb9287700e338152fb7ae8fe93029 /api | |
| parent | 5b5c09c75926dbd7c52b4e9016098ac87cbf32e1 (diff) | |
| parent | 781a83878ab8f6ba3fa725084a9d1de5a08b5da9 (diff) | |
| download | frameworks_base-66f29aa4a5869a628e45e715f6fc45dc79b55c95.zip frameworks_base-66f29aa4a5869a628e45e715f6fc45dc79b55c95.tar.gz frameworks_base-66f29aa4a5869a628e45e715f6fc45dc79b55c95.tar.bz2 | |
am 5aa45ef5: Merge "HCE/SE foreground support."
* commit '5aa45ef5ce6725638425aeeec29ac456f326d4c9':
HCE/SE foreground support.
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 6d4402b..c672613 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17136,6 +17136,7 @@ package android.nfc.cardemulation { } public final class CardEmulation { + method public boolean categoryAllowsForegroundPreference(java.lang.String); method public android.nfc.cardemulation.AidGroup getAidGroupForService(android.content.ComponentName, java.lang.String); method public static synchronized android.nfc.cardemulation.CardEmulation getInstance(android.nfc.NfcAdapter); method public int getSelectionModeForCategory(java.lang.String); @@ -17143,6 +17144,8 @@ package android.nfc.cardemulation { method public boolean isDefaultServiceForCategory(android.content.ComponentName, java.lang.String); method public boolean registerAidGroupForService(android.content.ComponentName, android.nfc.cardemulation.AidGroup); method public boolean removeAidGroupForService(android.content.ComponentName, java.lang.String); + method public boolean setPreferredService(android.app.Activity, android.content.ComponentName); + method public boolean unsetPreferredService(android.app.Activity); field public static final java.lang.String ACTION_CHANGE_DEFAULT = "android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT"; field public static final java.lang.String CATEGORY_OTHER = "other"; field public static final java.lang.String CATEGORY_PAYMENT = "payment"; |