am 588b7334: Merge "NFC JNI: log detected AID as a single message." into gingerbread

* commit '588b7334':
  NFC JNI: log detected AID as a single message.

jni/com_android_nfc.h

@@ -101,6 +101,9 @@ extern "C" {
 #define TARGET_TYPE_MIFARE_CLASSIC        8
 #define TARGET_TYPE_MIFARE_UL             9
 
+/* Maximum byte length of an AID. */
+#define AID_MAXLEN                        16
+
 /* Utility macros for logging */
 #define GET_LEVEL(status) ((status)==NFCSTATUS_SUCCESS)?ANDROID_LOG_DEBUG:ANDROID_LOG_WARN
 

jni/com_android_nfc_NativeNfcManager.cpp

@@ -18,6 +18,7 @@
 #include <pthread.h>
 #include <semaphore.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <math.h>
 #include <sys/queue.h>
 
@@ -1152,20 +1153,21 @@ static void nfc_jni_transaction_callback(void *context,
             case phLibNfc_eSE_EvtStartTransaction:
             {
                 TRACE("> SE EVT_START_TRANSACTION");
-                if(evt_info->UiccEvtInfo.aid.length <= 16)
+                if(evt_info->UiccEvtInfo.aid.length <= AID_MAXLEN)
                 {
                     aid = &(evt_info->UiccEvtInfo.aid);
 
                     LOGD("> AID DETECTED");
 
-                    LOGD("> AID:");
-                    for(i=0; i<(aid->length);i++)
-                    {
-                        LOGD("Ox%02x",aid->buffer[i]);
-                    }
-
                     if(aid != NULL)
                     {
+                        char aid_str[AID_MAXLEN * 2 + 1];
+                        aid_str[0] = '\0';
+                        for (i = 0; i < (aid->length) && i < AID_MAXLEN; i++) {
+                          snprintf(&aid_str[i*2], 3, "%02x", aid->buffer[i]);
+                        }
+                        LOGD("> AID: %s", aid_str);
+
                         aid_array = e->NewByteArray(aid->length);
                         if(aid_array == NULL)
                         {