summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authormike wakerly <mikey@google.com>2012-10-03 16:47:44 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-03 16:47:45 -0700
commit2e7b11af55efa97239ac2d96d36bc80e7107ffca (patch)
treeaa305cec283fdaa52d5c7913e254a7c9cc263e50 /core
parentc5caba0aed5f5eb6c22454e45895ff2a5abf4b46 (diff)
parentf74df47fc9aee3a274db006db5024892972a0c8a (diff)
downloadframeworks_base-2e7b11af55efa97239ac2d96d36bc80e7107ffca.zip
frameworks_base-2e7b11af55efa97239ac2d96d36bc80e7107ffca.tar.gz
frameworks_base-2e7b11af55efa97239ac2d96d36bc80e7107ffca.tar.bz2
Merge "NfcAdapterExtras: expose driver name." into jb-mr1-dev
Diffstat (limited to 'core')
-rw-r--r--core/java/android/nfc/INfcAdapterExtras.aidl1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/nfc/INfcAdapterExtras.aidl b/core/java/android/nfc/INfcAdapterExtras.aidl
index 2b9d4f0..41ebf63 100644
--- a/core/java/android/nfc/INfcAdapterExtras.aidl
+++ b/core/java/android/nfc/INfcAdapterExtras.aidl
@@ -29,4 +29,5 @@ interface INfcAdapterExtras {
int getCardEmulationRoute(in String pkg);
void setCardEmulationRoute(in String pkg, int route);
void authenticate(in String pkg, in byte[] token);
+ String getDriverName(in String pkg);
}