summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2012-08-07 10:54:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-07 10:54:24 -0700
commit484d6a32e4d35e3e2e408010e12a51dfe0224632 (patch)
treeb30e5425acee2dab41897cfeb0d7d2e6175e0d16 /src/com/android
parent91e826241003a5ac72f911b6c0bbc10075c39d84 (diff)
parentbb65a8d87ee523c92ca1b5f57efe139bab3859fe (diff)
downloadpackages_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 'src/com/android')
-rwxr-xr-xsrc/com/android/nfc/NfcService.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index c42bdc0..ab294ea 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -860,10 +860,6 @@ public class NfcService extends Application implements DeviceHostListener {
return ErrorCodes.ERROR_DISCONNECT;
}
- if (technology == TagTechnology.NFC_B) {
- return ErrorCodes.ERROR_NOT_SUPPORTED;
- }
-
// Note that on most tags, all technologies are behind a single
// handle. This means that the connect at the lower levels
// will do nothing, as the tag is already connected to that handle.