diff options
| author | Martijn Coenen <maco@google.com> | 2012-08-07 10:54:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-07 10:54:24 -0700 |
| commit | 484d6a32e4d35e3e2e408010e12a51dfe0224632 (patch) | |
| tree | b30e5425acee2dab41897cfeb0d7d2e6175e0d16 /nxp | |
| parent | 91e826241003a5ac72f911b6c0bbc10075c39d84 (diff) | |
| parent | bb65a8d87ee523c92ca1b5f57efe139bab3859fe (diff) | |
| download | packages_apps_nfc-484d6a32e4d35e3e2e408010e12a51dfe0224632.zip packages_apps_nfc-484d6a32e4d35e3e2e408010e12a51dfe0224632.tar.gz packages_apps_nfc-484d6a32e4d35e3e2e408010e12a51dfe0224632.tar.bz2 | |
am bb65a8d8: Allow NfcB connects in NCI stack.
* commit 'bb65a8d87ee523c92ca1b5f57efe139bab3859fe':
Allow NfcB connects in NCI stack.
Diffstat (limited to 'nxp')
| -rwxr-xr-x | nxp/src/com/android/nfc/dhimpl/NativeNfcTag.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nxp/src/com/android/nfc/dhimpl/NativeNfcTag.java b/nxp/src/com/android/nfc/dhimpl/NativeNfcTag.java index eddde94..45a59d2 100755 --- a/nxp/src/com/android/nfc/dhimpl/NativeNfcTag.java +++ b/nxp/src/com/android/nfc/dhimpl/NativeNfcTag.java @@ -136,6 +136,10 @@ public class NativeNfcTag implements TagEndpoint { private native int doConnect(int handle); public synchronized int connectWithStatus(int technology) { + if (technology == TagTechnology.NFC_B) { + // Not supported by PN544 + return -1; + } if (mWatchdog != null) { mWatchdog.pause(); } |