Merge "Improve Kovio reading reliability." into jb-mr2-dev
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index b551829..9f6cd7f 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -1758,6 +1758,16 @@
                     if (DBG) Log.d(TAG, "Tag detected, notifying applications");
                     TagEndpoint tag = (TagEndpoint) msg.obj;
                     playSound(SOUND_START);
+                    if (tag.getConnectedTechnology() == TagTechnology.NFC_BARCODE) {
+                        // When these tags start containing NDEF, they will require
+                        // the stack to deal with them in a different way, since
+                        // they are activated only really shortly.
+                        // For now, don't consider NDEF on these.
+                        if (DBG) Log.d(TAG, "Skipping NDEF detection for NFC Barcode");
+                        tag.startPresenceChecking();
+                        dispatchTagEndpoint(tag);
+                        break;
+                    }
                     NdefMessage ndefMsg = tag.findAndReadNdef();
 
                     if (ndefMsg != null) {