summaryrefslogtreecommitdiffstats
path: root/Android.mk
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 /Android.mk
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 'Android.mk')
-rw-r--r--Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index f5b1cd9..aaf85de 100644
--- a/Android.mk
+++ b/Android.mk
@@ -143,6 +143,7 @@ LOCAL_SRC_FILES += \
core/java/android/nfc/INfcAdapter.aidl \
core/java/android/nfc/INfcAdapterExtras.aidl \
core/java/android/nfc/INfcTag.aidl \
+ core/java/android/nfc/INfcCardEmulation.aidl \
core/java/android/os/IBatteryPropertiesListener.aidl \
core/java/android/os/IBatteryPropertiesRegistrar.aidl \
core/java/android/os/ICancellationSignal.aidl \