summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2013-07-30 20:07:47 -0700
committerMartijn Coenen <maco@google.com>2013-08-02 17:22:53 -0700
commita7397883de67d674970d91f86d46ccf637e5e543 (patch)
treeeaef378b35af8374b8f8940f59c789d7bc66d8b9 /api
parentd8501485e30c1184292f15349b9e439343ff5b60 (diff)
downloadframeworks_base-a7397883de67d674970d91f86d46ccf637e5e543.zip
frameworks_base-a7397883de67d674970d91f86d46ccf637e5e543.tar.gz
frameworks_base-a7397883de67d674970d91f86d46ccf637e5e543.tar.bz2
NFC: Host-based card emulation APIs.
- New INfcCardEmulation interface to allow apps to interface with card emulation system. - New BIND_NFC_SERVICE permission to prevent malicious apps from binding to card emulation services. - ApduServiceInfo is now in the framework. - Added constants to Settings.Secure for storing defaults. - Modified XML grammar a bit. Change-Id: I56b3fa6b42eb5dc132c91c1386ab1e6bac779059
Diffstat (limited to 'api')
-rw-r--r--api/current.txt13
1 files changed, 13 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 6bb40e1..94d0075 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";
@@ -14785,6 +14786,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);