summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormike wakerly <mikey@google.com>2012-10-03 13:08:07 -0700
committermike wakerly <mikey@google.com>2012-10-03 14:12:21 -0700
commit55b2c9109e15be7965dd7b4385e6a68e47167e09 (patch)
treef239c0bd1ac4342e77930a342e22fbcfb5009738 /src
parentef953e21ec44e2512ae2cae082d98cf8d492ef2a (diff)
downloadpackages_apps_nfc-55b2c9109e15be7965dd7b4385e6a68e47167e09.zip
packages_apps_nfc-55b2c9109e15be7965dd7b4385e6a68e47167e09.tar.gz
packages_apps_nfc-55b2c9109e15be7965dd7b4385e6a68e47167e09.tar.bz2
NfcAdapterExtras: add driver name.
Bug: 7276355 Change-Id: If2732afd542a68dc440308dae9eb76eb7ff31e25
Diffstat (limited to 'src')
-rw-r--r--src/com/android/nfc/DeviceHost.java2
-rwxr-xr-xsrc/com/android/nfc/NfcService.java6
2 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/nfc/DeviceHost.java b/src/com/android/nfc/DeviceHost.java
index b7336ad..487d2ad 100644
--- a/src/com/android/nfc/DeviceHost.java
+++ b/src/com/android/nfc/DeviceHost.java
@@ -175,6 +175,8 @@ public interface DeviceHost {
public boolean deinitialize();
+ public String getName();
+
public void enableDiscovery();
public void disableDiscovery();
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index ca1713d..55570a1 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -1360,6 +1360,12 @@ public class NfcService extends Application implements DeviceHostListener {
public void authenticate(String pkg, byte[] token) throws RemoteException {
NfcService.this.enforceNfceeAdminPerm(pkg);
}
+
+ @Override
+ public String getDriverName(String pkg) throws RemoteException {
+ NfcService.this.enforceNfceeAdminPerm(pkg);
+ return mDeviceHost.getName();
+ }
}
/** resources kept while secure element is open */