diff options
| author | mike wakerly <mikey@google.com> | 2012-10-03 16:47:06 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-03 16:47:07 -0700 |
| commit | b2d09c062c2215c5e32c65efd62d372babcdf62a (patch) | |
| tree | 96dc199a39262909e06a194a873de7eb01eb15c4 /nci | |
| parent | fc388de82a3d26b31ceb4b7cb9ec147bf69cce21 (diff) | |
| parent | 55b2c9109e15be7965dd7b4385e6a68e47167e09 (diff) | |
| download | packages_apps_nfc-b2d09c062c2215c5e32c65efd62d372babcdf62a.zip packages_apps_nfc-b2d09c062c2215c5e32c65efd62d372babcdf62a.tar.gz packages_apps_nfc-b2d09c062c2215c5e32c65efd62d372babcdf62a.tar.bz2 | |
Merge "NfcAdapterExtras: add driver name." into jb-mr1-dev
Diffstat (limited to 'nci')
| -rwxr-xr-x | nci/src/com/android/nfc/dhimpl/NativeNfcManager.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java b/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java index 921e266..dde0c08 100755 --- a/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java +++ b/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java @@ -38,6 +38,8 @@ public class NativeNfcManager implements DeviceHost { static final int DEFAULT_LLCP_MIU = 1980; static final int DEFAULT_LLCP_RWSIZE = 2; + static final String DRIVER_NAME = "android-nci"; + static { System.loadLibrary("nfc_nci_jni"); } @@ -99,6 +101,11 @@ public class NativeNfcManager implements DeviceHost { } @Override + public String getName() { + return DRIVER_NAME; + } + + @Override public native void enableDiscovery(); @Override |