commit 7be7f5f8563dbbd1bf45303f0d987b5b7f488c94
author Martijn Coenen <martijn.coenen@nxp.com> Mon Dec 06 17:47:00 2010 -0800
committer Nick Pelly <npelly@google.com> Mon Dec 06 18:35:31 2010 -0800
tree 8e97776584ce43a5dd3055a2b0204d6d9a6f1631
parent 257d2cbfb3ee0d0db9ad5738886569253d598f1a

Add NdefFormatable to the tech tree.

Change-Id: I257b0cffa5117084feacd5f1cb4909c3224b2f2a

jni/com_android_nfc.cpp

diff --git a/jni/com_android_nfc.cpp b/jni/com_android_nfc.cpp
index 560a7f2..0318577 100644
--- a/jni/com_android_nfc.cpp
+++ b/jni/com_android_nfc.cpp
@@ -349,10 +349,11 @@
       case phNfc_eISO14443_A_PICC:
       case phNfc_eISO14443_4A_PICC:
         {
-          techList = e->NewIntArray(2);
+          techList = e->NewIntArray(3);
           techItems = e->GetIntArrayElements(techList, NULL);
           techItems[0] = TARGET_TYPE_ISO14443_4;
           techItems[1] = TARGET_TYPE_ISO14443_3A;
+          techItems[2] = TARGET_TYPE_NDEF_FORMATABLE;
           e->ReleaseIntArrayElements(techList, techItems,0);
           break;
         }
@@ -399,10 +400,11 @@
           {
             case 0x00:
               // could be UL or UL-C
-              techList = e->NewIntArray(2);
+              techList = e->NewIntArray(3);
               techItems = e->GetIntArrayElements(techList, NULL);
               techItems[0] = TARGET_TYPE_MIFARE_UL;
               techItems[1] = TARGET_TYPE_ISO14443_3A;
+              techItems[2] = TARGET_TYPE_NDEF_FORMATABLE;
               e->ReleaseIntArrayElements(techList, techItems,0);
               break;
             case 0x08:
@@ -419,6 +421,7 @@
               techItems = e->GetIntArrayElements(techList, NULL);
               techItems[0] = TARGET_TYPE_MIFARE_CLASSIC;
               techItems[1] = TARGET_TYPE_ISO14443_3A;
+              techItems[2] = TARGET_TYPE_NDEF_FORMATABLE;
               e->ReleaseIntArrayElements(techList, techItems,0);
               break;
             case 0x20:

jni/com_android_nfc.h

diff --git a/jni/com_android_nfc.h b/jni/com_android_nfc.h
index 6d011d8..3dd32a1 100644
--- a/jni/com_android_nfc.h
+++ b/jni/com_android_nfc.h
@@ -77,6 +77,7 @@
 #define TARGET_TYPE_MIFARE_DESFIRE        203
 #define TARGET_TYPE_FELICA                11
 #define TARGET_TYPE_JEWEL                 101
+#define TARGET_TYPE_NDEF_FORMATABLE       110
 
 /* Utility macros for logging */
 #define GET_LEVEL(status) ((status)==NFCSTATUS_SUCCESS)?ANDROID_LOG_DEBUG:ANDROID_LOG_WARN