am 484d6a32: am bb65a8d8: Allow NfcB connects in NCI stack.

* commit '484d6a32e4d35e3e2e408010e12a51dfe0224632':
  Allow NfcB connects in NCI stack.

2 files changed, 4 insertions, 4 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();
         }
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.