diff options
| author | Martijn Coenen <maco@google.com> | 2013-08-03 00:49:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-03 00:49:03 +0000 |
| commit | badb063c81ef805377dac69048afaa02cea6593c (patch) | |
| tree | bce19678e97723c6004eb119f8b367c6aaca63d0 /api | |
| parent | cf9d87c68874e6008399fa1f571dbff34cf3fc82 (diff) | |
| parent | a7397883de67d674970d91f86d46ccf637e5e543 (diff) | |
| download | frameworks_base-badb063c81ef805377dac69048afaa02cea6593c.zip frameworks_base-badb063c81ef805377dac69048afaa02cea6593c.tar.gz frameworks_base-badb063c81ef805377dac69048afaa02cea6593c.tar.bz2 | |
Merge "NFC: Host-based card emulation APIs."
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 32fa009..429caa5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -23,6 +23,7 @@ package android { field public static final java.lang.String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET"; field public static final java.lang.String BIND_DEVICE_ADMIN = "android.permission.BIND_DEVICE_ADMIN"; field public static final java.lang.String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD"; + field public static final java.lang.String BIND_NFC_SERVICE = "android.permission.BIND_NFC_SERVICE"; field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"; field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE"; field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS"; @@ -14808,6 +14809,18 @@ package android.nfc { package android.nfc.cardemulation { + public final class CardEmulationManager { + method public static synchronized android.nfc.cardemulation.CardEmulationManager getInstance(android.nfc.NfcAdapter); + method public boolean isDefaultServiceForAid(android.content.ComponentName, java.lang.String); + method public boolean isDefaultServiceForCategory(android.content.ComponentName, java.lang.String); + method public boolean setDefaultServiceForCategory(android.content.ComponentName, java.lang.String); + field public static final java.lang.String ACTION_CHANGE_DEFAULT = "android.nfc.cardemulation.ACTION_CHANGE_DEFAULT"; + field public static final java.lang.String CATEGORY_OTHER = "other"; + field public static final java.lang.String CATEGORY_PAYMENT = "payment"; + field public static final java.lang.String EXTRA_CATEGORY = "category"; + field public static final java.lang.String EXTRA_SERVICE_COMPONENT = "component"; + } + public abstract class HostApduService extends android.app.Service { ctor public HostApduService(); method public final android.os.IBinder onBind(android.content.Intent); |