Quiet most logs in NFC by default.
Bug: 3124915
Change-Id: If5a3e6b21fe43d9ce2ff82ee65751baaa1c0e0a2
Signed-off-by: Nick Pelly <npelly@google.com>
diff --git a/jni/com_android_nfc.h b/jni/com_android_nfc.h
index 505f622..032fc48 100644
--- a/jni/com_android_nfc.h
+++ b/jni/com_android_nfc.h
@@ -30,9 +30,11 @@
#include <phNfcIoctlCode.h>
#include <phLibNfc.h>
#include <phDal4Nfc_messageQueueLib.h>
+#include <cutils/log.h>
}
#include <cutils/properties.h> // for property_get
+
/* Discovery modes -- keep in sync with NFCManager.DISCOVERY_MODE_* */
#define DISCOVERY_MODE_TAG_READER 0
#define DISCOVERY_MODE_NFCIP1 1
@@ -77,7 +79,15 @@
/* Utility macros for logging */
#define GET_LEVEL(status) ((status)==NFCSTATUS_SUCCESS)?ANDROID_LOG_DEBUG:ANDROID_LOG_WARN
-#define LOG_CALLBACK(funcName, status) LOG_PRI(GET_LEVEL(status), LOG_TAG, "Callback: %s() - status=0x%04x[%s]", funcName, status, nfc_jni_get_status_name(status));
+
+#if 0
+ #define LOG_CALLBACK(funcName, status) LOG_PRI(GET_LEVEL(status), LOG_TAG, "Callback: %s() - status=0x%04x[%s]", funcName, status, nfc_jni_get_status_name(status));
+ #define TRACE(...) LOG(LOG_DEBUG, "NdefMessage", __VA_ARGS__)
+#else
+ #define LOG_CALLBACK(...)
+ #define TRACE(...)
+#endif
+
struct nfc_jni_native_data
{
diff --git a/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp b/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp
index 193ed80..6f76c55 100644
--- a/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp
+++ b/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp
@@ -40,7 +40,7 @@
if(status == NFCSTATUS_SUCCESS)
{
*receiveSsap = ssap;
- LOGD("RECEIVE UI_FRAME FROM SAP %d OK \n",*receiveSsap);
+ TRACE("RECEIVE UI_FRAME FROM SAP %d OK \n",*receiveSsap);
}
sem_post(nfc_jni_llcp_receive_sem);
@@ -73,7 +73,7 @@
sSendBuffer.buffer = (uint8_t*)e->GetByteArrayElements(data, NULL);
sSendBuffer.length = (uint32_t)e->GetArrayLength(data);
- LOGD("phLibNfc_Llcp_SendTo()");
+ TRACE("phLibNfc_Llcp_SendTo()");
REENTRANCE_LOCK();
ret = phLibNfc_Llcp_SendTo(hLlcpSocket,
nsap,
@@ -86,7 +86,7 @@
LOGE("phLibNfc_Llcp_SendTo() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
return FALSE;
}
- LOGD("phLibNfc_Llcp_SendTo() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_Llcp_SendTo() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
/* Wait for callback response */
if(sem_wait(nfc_jni_llcp_send_sem) == -1)
@@ -118,7 +118,7 @@
/* Create new LlcpPacket object */
if(nfc_jni_cache_object(e,"android/nfc/LlcpPacket",&(llcpPacket)) == -1)
{
- LOGD("Find LlcpPacket class error");
+ LOGE("Find LlcpPacket class error");
return NULL;
}
@@ -126,20 +126,17 @@
clsLlcpPacket = e->GetObjectClass(llcpPacket);
if(e->ExceptionCheck())
{
- LOGD("Get Object class error");
+ LOGE("Get Object class error");
return NULL;
}
/* Retrieve socket handle */
hLlcpSocket = nfc_jni_get_nfc_socket_handle(e,o);
- LOGD("Socket Handle = 0x%02x",hLlcpSocket);
-
- LOGD("Link LIU = %d",linkMiu);
+ TRACE("phLibNfc_Llcp_RecvFrom(), Socket Handle = 0x%02x, Link LIU = %d", hLlcpSocket, linkMiu);
sReceiveBuffer.buffer = (uint8_t*)malloc(linkMiu);
sReceiveBuffer.length = linkMiu;
- LOGD("phLibNfc_Llcp_RecvFrom()");
REENTRANCE_LOCK();
ret = phLibNfc_Llcp_RecvFrom(hLlcpSocket,
&sReceiveBuffer,
@@ -151,7 +148,7 @@
LOGE("phLibNfc_Llcp_RecvFrom() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
return NULL;
}
- LOGD("phLibNfc_Llcp_RecvFrom() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_Llcp_RecvFrom() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
/* Wait for callback response */
if(sem_wait(nfc_jni_llcp_receive_sem) == -1)
@@ -160,9 +157,7 @@
if(nfc_jni_cb_status == NFCSTATUS_SUCCESS)
{
- LOGD("Data Received From SSAP = %d\n",ssap);
-
- LOGD("Data Received Length = %d\n",sReceiveBuffer.length);
+ TRACE("Data Received From SSAP = %d\n, length = %d", ssap, sReceiveBuffer.length);
/* Set Llcp Packet remote SAP */
f = e->GetFieldID(clsLlcpPacket, "mRemoteSap", "I");
@@ -187,18 +182,18 @@
{
NFCSTATUS ret;
phLibNfc_Handle hLlcpSocket;
- LOGD("Close Connectionless socket");
+ TRACE("Close Connectionless socket");
/* Retrieve socket handle */
hLlcpSocket = nfc_jni_get_nfc_socket_handle(e,o);
- LOGD("phLibNfc_Llcp_Close()");
+ TRACE("phLibNfc_Llcp_Close()");
REENTRANCE_LOCK();
ret = phLibNfc_Llcp_Close(hLlcpSocket);
REENTRANCE_UNLOCK();
if(ret == NFCSTATUS_SUCCESS)
{
- LOGD("phLibNfc_Llcp_Close() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_Llcp_Close() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
return TRUE;
}
else
diff --git a/jni/com_android_nfc_NativeLlcpServiceSocket.cpp b/jni/com_android_nfc_NativeLlcpServiceSocket.cpp
index 9d8905d..3c8b287 100644
--- a/jni/com_android_nfc_NativeLlcpServiceSocket.cpp
+++ b/jni/com_android_nfc_NativeLlcpServiceSocket.cpp
@@ -73,7 +73,7 @@
sWorkingBuffer.length = (miu*rw)+ miu + linearBufferLength;
/* Accept the incomming socket */
- LOGD("phLibNfc_Llcp_Accept()");
+ TRACE("phLibNfc_Llcp_Accept()");
REENTRANCE_LOCK();
ret = phLibNfc_Llcp_Accept( hIncommingLlcpSocket,
&sOptions,
@@ -87,7 +87,7 @@
LOGE("phLibNfc_Llcp_Accept() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
return NULL;
}
- LOGD("phLibNfc_Llcp_Accept() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_Llcp_Accept() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
/* Wait for tag Notification */
if(sem_wait(nfc_jni_llcp_sem) == -1)
@@ -115,19 +115,17 @@
/* Set socket handle */
f = e->GetFieldID(clsNativeLlcpSocket, "mHandle", "I");
e->SetIntField(clientSocket, f,(jint)hIncommingLlcpSocket);
- LOGD("socket Handle = %02x\n",hIncommingLlcpSocket);
/* Set socket MIU */
f = e->GetFieldID(clsNativeLlcpSocket, "mLocalMiu", "I");
e->SetIntField(clientSocket, f,(jint)miu);
- LOGD("socket MIU = %d\n",miu);
/* Set socket RW */
f = e->GetFieldID(clsNativeLlcpSocket, "mLocalRw", "I");
e->SetIntField(clientSocket, f,(jint)rw);
- LOGD("socket RW = %d\n",rw);
-
-
+
+ TRACE("socket handle 0x%02x: MIU = %d, RW = %d\n",hIncommingLlcpSocket, miu, rw);
+
return clientSocket;
}
@@ -141,7 +139,7 @@
{
NFCSTATUS ret;
phLibNfc_Handle hLlcpSocket;
- LOGD("Close Service socket");
+ TRACE("Close Service socket");
/* Retrieve socket handle */
hLlcpSocket = nfc_jni_get_nfc_socket_handle(e,o);
@@ -151,7 +149,7 @@
REENTRANCE_UNLOCK();
if(ret == NFCSTATUS_SUCCESS)
{
- LOGD("Close Service socket OK");
+ TRACE("Close Service socket OK");
return TRUE;
}
else
diff --git a/jni/com_android_nfc_NativeLlcpSocket.cpp b/jni/com_android_nfc_NativeLlcpSocket.cpp
index 90aec16..5fb772f 100644
--- a/jni/com_android_nfc_NativeLlcpSocket.cpp
+++ b/jni/com_android_nfc_NativeLlcpSocket.cpp
@@ -50,7 +50,7 @@
if(status == NFCSTATUS_SUCCESS)
{
- LOGD("Socket connected\n");
+ TRACE("Socket connected\n");
}
else
{
@@ -125,7 +125,7 @@
/* Retrieve socket handle */
hLlcpSocket = nfc_jni_get_nfc_socket_handle(e,o);
- LOGD("phLibNfc_Llcp_Connect(%d)",nSap);
+ TRACE("phLibNfc_Llcp_Connect(%d)",nSap);
REENTRANCE_LOCK();
ret = phLibNfc_Llcp_Connect(hLlcpSocket,
nSap,
@@ -137,7 +137,7 @@
LOGE("phLibNfc_Llcp_Connect(%d) returned 0x%04x[%s]", nSap, ret, nfc_jni_get_status_name(ret));
return FALSE;
}
- LOGD("phLibNfc_Llcp_Connect(%d) returned 0x%04x[%s]", nSap, ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_Llcp_Connect(%d) returned 0x%04x[%s]", nSap, ret, nfc_jni_get_status_name(ret));
/* Wait for callback response */
if(sem_wait(nfc_jni_llcp_sem) == -1)
@@ -145,7 +145,7 @@
if(nfc_jni_cb_status == NFCSTATUS_SUCCESS)
{
- LOGD("LLCP Connect request OK");
+ TRACE("LLCP Connect request OK");
return TRUE;
}
else
@@ -169,7 +169,7 @@
serviceName.buffer = (uint8_t*)e->GetStringUTFChars(sn, NULL);
serviceName.length = (uint32_t)e->GetStringUTFLength(sn);
- LOGD("phLibNfc_Llcp_ConnectByUri()");
+ TRACE("phLibNfc_Llcp_ConnectByUri()");
REENTRANCE_LOCK();
ret = phLibNfc_Llcp_ConnectByUri(hLlcpSocket,
&serviceName,
@@ -181,7 +181,7 @@
LOGE("phLibNfc_Llcp_ConnectByUri() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
return FALSE;
}
- LOGD("phLibNfc_Llcp_ConnectByUri() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_Llcp_ConnectByUri() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
/* Wait for callback response */
if(sem_wait(nfc_jni_llcp_sem) == -1)
@@ -205,7 +205,7 @@
/* Retrieve socket handle */
hLlcpSocket = nfc_jni_get_nfc_socket_handle(e,o);
- LOGD("phLibNfc_Llcp_Close()");
+ TRACE("phLibNfc_Llcp_Close()");
REENTRANCE_LOCK();
ret = phLibNfc_Llcp_Close(hLlcpSocket);
REENTRANCE_UNLOCK();
@@ -214,7 +214,7 @@
LOGE("phLibNfc_Llcp_Close() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
return FALSE;
}
- LOGD("phLibNfc_Llcp_Close() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_Llcp_Close() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
return TRUE;
}
@@ -231,7 +231,7 @@
sSendBuffer.buffer = (uint8_t*)e->GetByteArrayElements(data, NULL);
sSendBuffer.length = (uint32_t)e->GetArrayLength(data);
- LOGD("phLibNfc_Llcp_Send()");
+ TRACE("phLibNfc_Llcp_Send()");
REENTRANCE_LOCK();
ret = phLibNfc_Llcp_Send(hLlcpSocket,
&sSendBuffer,
@@ -243,7 +243,7 @@
LOGE("phLibNfc_Llcp_Send() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
return FALSE;
}
- LOGD("phLibNfc_Llcp_Send() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_Llcp_Send() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
/* Wait for callback response */
if(sem_wait(nfc_jni_llcp_sem) == -1)
@@ -273,7 +273,7 @@
sReceiveBuffer.buffer = (uint8_t*)e->GetByteArrayElements(buffer, NULL);
sReceiveBuffer.length = (uint32_t)e->GetArrayLength(buffer);
- LOGD("phLibNfc_Llcp_Recv()");
+ TRACE("phLibNfc_Llcp_Recv()");
REENTRANCE_LOCK();
ret = phLibNfc_Llcp_Recv(hLlcpSocket,
&sReceiveBuffer,
@@ -286,7 +286,7 @@
LOGE("phLibNfc_Llcp_Recv() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
return 0;
}
- LOGD("phLibNfc_Llcp_Recv() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_Llcp_Recv() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
/* Wait for callback response (happen if status is either SUCCESS or PENDING) */
if(sem_wait(nfc_jni_llcp_sem) == -1)
@@ -313,14 +313,14 @@
/* Retrieve socket handle */
hLlcpSocket = nfc_jni_get_nfc_socket_handle(e,o);
- LOGD("phLibNfc_Llcp_SocketGetRemoteOptions(MIU)");
+ TRACE("phLibNfc_Llcp_SocketGetRemoteOptions(MIU)");
REENTRANCE_LOCK();
ret = phLibNfc_Llcp_SocketGetRemoteOptions(hLlcpSocket,
&remoteSocketOption);
REENTRANCE_UNLOCK();
if(ret == NFCSTATUS_SUCCESS)
{
- LOGD("phLibNfc_Llcp_SocketGetRemoteOptions(MIU) returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_Llcp_SocketGetRemoteOptions(MIU) returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
return remoteSocketOption.miu;
}
else
@@ -339,14 +339,14 @@
/* Retrieve socket handle */
hLlcpSocket = nfc_jni_get_nfc_socket_handle(e,o);
- LOGD("phLibNfc_Llcp_SocketGetRemoteOptions(RW)");
+ TRACE("phLibNfc_Llcp_SocketGetRemoteOptions(RW)");
REENTRANCE_LOCK();
ret = phLibNfc_Llcp_SocketGetRemoteOptions(hLlcpSocket,
&remoteSocketOption);
REENTRANCE_UNLOCK();
if(ret == NFCSTATUS_SUCCESS)
{
- LOGD("phLibNfc_Llcp_SocketGetRemoteOptions(RW) returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_Llcp_SocketGetRemoteOptions(RW) returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
return remoteSocketOption.rw;
}
else
diff --git a/jni/com_android_nfc_NativeNdefTag.cpp b/jni/com_android_nfc_NativeNdefTag.cpp
index 63dcde7..e236d00 100644
--- a/jni/com_android_nfc_NativeNdefTag.cpp
+++ b/jni/com_android_nfc_NativeNdefTag.cpp
@@ -52,7 +52,7 @@
nfc_jni_ndef_rw.length = nfc_jni_ndef_buf_len;
nfc_jni_ndef_rw.buffer = nfc_jni_ndef_buf;
- LOGD("phLibNfc_Ndef_Read()");
+ TRACE("phLibNfc_Ndef_Read()");
REENTRANCE_LOCK();
status = phLibNfc_Ndef_Read( handle,
&nfc_jni_ndef_rw,
@@ -65,7 +65,7 @@
LOGE("phLibNfc_Ndef_Read() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
goto clean_and_return;
}
- LOGD("phLibNfc_Ndef_Read() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
+ TRACE("phLibNfc_Ndef_Read() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
/* Wait for callback response */
sem_wait(nfc_jni_ndef_tag_sem);
@@ -97,7 +97,7 @@
nfc_jni_ndef_rw.length = (uint32_t)e->GetArrayLength(buf);
nfc_jni_ndef_rw.buffer = (uint8_t *)e->GetByteArrayElements(buf, NULL);
- LOGD("phLibNfc_Ndef_Write()");
+ TRACE("phLibNfc_Ndef_Write()");
REENTRANCE_LOCK();
status = phLibNfc_Ndef_Write(handle, &nfc_jni_ndef_rw,nfc_jni_tag_rw_callback, (void *)e);
REENTRANCE_UNLOCK();
@@ -106,7 +106,7 @@
LOGE("phLibNfc_Ndef_Write() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
goto clean_and_return;
}
- LOGD("phLibNfc_Ndef_Write() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
+ TRACE("phLibNfc_Ndef_Write() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
/* Wait for callback response */
sem_wait(nfc_jni_ndef_tag_sem);
diff --git a/jni/com_android_nfc_NativeNfcManager.cpp b/jni/com_android_nfc_NativeNfcManager.cpp
index 74d63fa..18fc27e 100644
--- a/jni/com_android_nfc_NativeNfcManager.cpp
+++ b/jni/com_android_nfc_NativeNfcManager.cpp
@@ -209,7 +209,7 @@
property_get("ro.nfc.port", value, "unknown");
gDrvCfg.nLinkType = parseLinkType(value);
- LOGD("phLibNfc_Mgt_ConfigureDriver(0x%08x, 0x%08x)", gDrvCfg.nClientId, gDrvCfg.nLinkType);
+ TRACE("phLibNfc_Mgt_ConfigureDriver(0x%08x, 0x%08x)", gDrvCfg.nClientId, gDrvCfg.nLinkType);
REENTRANCE_LOCK();
status = phLibNfc_Mgt_ConfigureDriver(&gDrvCfg, &gHWRef);
REENTRANCE_UNLOCK();
@@ -222,7 +222,7 @@
LOGE("phLibNfc_Mgt_ConfigureDriver() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
goto clean_and_return;
}
- LOGD("phLibNfc_Mgt_ConfigureDriver() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
+ TRACE("phLibNfc_Mgt_ConfigureDriver() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
/* TODO: here would be a good place to perform HW reset of the chip */
@@ -233,7 +233,7 @@
goto clean_and_return;
}
- LOGD("phLibNfc_Mgt_Initialize()");
+ TRACE("phLibNfc_Mgt_Initialize()");
REENTRANCE_LOCK();
status = phLibNfc_Mgt_Initialize(gHWRef, nfc_jni_init_callback, (void *)nat);
REENTRANCE_UNLOCK();
@@ -242,7 +242,7 @@
LOGE("phLibNfc_Mgt_Initialize() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
goto clean_and_return;
}
- LOGD("phLibNfc_Mgt_Initialize returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
+ TRACE("phLibNfc_Mgt_Initialize returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
/* Wait for callback response */
sem_wait(nfc_jni_init_sem);
@@ -254,14 +254,14 @@
}
// Update EEPROM settings
- LOGD("****** START EEPROM SETTINGS UPDATE ******");
+ TRACE("****** START EEPROM SETTINGS UPDATE ******");
for(i=0; i< EEDATA_SETTINGS_NUMBER; i++)
{
gInputParam.buffer = EEDATA_Settings[i];
gInputParam.length = 0x04;
gOutputParam.buffer = resp;
- LOGD("> EEPROM SETTING: %d",i);
+ TRACE("> EEPROM SETTING: %d",i);
REENTRANCE_LOCK();
status = phLibNfc_Mgt_IoCtl(gHWRef,NFC_MEM_WRITE, &gInputParam, &gOutputParam, nfc_jni_ioctl_callback, (void *)nat);
REENTRANCE_UNLOCK();
@@ -279,7 +279,7 @@
goto clean_and_return;
}
}
- LOGD("****** ALL EEPROM SETTINGS UPDATED ******");
+ TRACE("****** ALL EEPROM SETTINGS UPDATED ******");
REENTRANCE_LOCK();
@@ -302,26 +302,26 @@
/* Get Secure Element List */
REENTRANCE_LOCK();
- LOGD("phLibNfc_SE_GetSecureElementList()");
+ TRACE("phLibNfc_SE_GetSecureElementList()");
status = phLibNfc_SE_GetSecureElementList(SE_List, &No_SE);
REENTRANCE_UNLOCK();
if (status == NFCSTATUS_SUCCESS)
{
- LOGD("\n> Number of Secure Element(s) : %d\n", No_SE);
+ TRACE("\n> Number of Secure Element(s) : %d\n", No_SE);
/* Display Secure Element information */
for (i = 0; i<No_SE; i++)
{
if (SE_List[i].eSE_Type == phLibNfc_SE_Type_SmartMX)
{
- LOGD("phLibNfc_SE_GetSecureElementList(): SMX detected");
+ TRACE("phLibNfc_SE_GetSecureElementList(): SMX detected");
}
else if(SE_List[i].eSE_Type == phLibNfc_SE_Type_UICC)
{
- LOGD("phLibNfc_SE_GetSecureElementList(): UICC detected");
+ TRACE("phLibNfc_SE_GetSecureElementList(): UICC detected");
}
/* Set SE mode - Off */
- LOGD("****** Initialize Secure Element ******");
+ TRACE("****** Initialize Secure Element ******");
REENTRANCE_LOCK();
status = phLibNfc_SE_SetMode(SE_List[i].hSecureElement,phLibNfc_SE_ActModeOff, nfc_jni_se_set_mode_callback,(void *)nat);
REENTRANCE_UNLOCK();
@@ -332,7 +332,7 @@
LOGE("phLibNfc_SE_SetMode() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
goto clean_and_return;
}
- LOGD("phLibNfc_SE_SetMode() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
+ TRACE("phLibNfc_SE_SetMode() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
/* Wait for callback response */
sem_wait(nfc_jni_manager_sem);
@@ -369,9 +369,7 @@
phLibNfc_sADD_Cfg_t discovery_cfg;
phLibNfc_Registry_Info_t registration_cfg;
- LOGW("Emergency recovery called");
-
- LOGE("force restart of NFC service");
+ LOGE("emergency_recovery: force restart of NFC service");
abort(); // force a noisy crash
}
@@ -382,14 +380,14 @@
{
int ret;
- LOGW("Restarting polling loop");
+ TRACE("Restarting polling loop");
/* Restart Polling loop */
- LOGD("****** Start NFC Discovery ******");
+ TRACE("****** Start NFC Discovery ******");
REENTRANCE_LOCK();
ret = phLibNfc_Mgt_ConfigureDiscovery(NFC_DISCOVERY_RESUME,nat->discovery_cfg, nfc_jni_discover_callback, (void *)nat);
REENTRANCE_UNLOCK();
- LOGD("phLibNfc_Mgt_ConfigureDiscovery(%s-%s-%s-%s-%s-%s, %s-%x-%x) returned 0x%08x\n",
+ TRACE("phLibNfc_Mgt_ConfigureDiscovery(%s-%s-%s-%s-%s-%s, %s-%x-%x) returned 0x%08x\n",
nat->discovery_cfg.PollDevInfo.PollCfgInfo.EnableIso14443A==TRUE?"3A":"",
nat->discovery_cfg.PollDevInfo.PollCfgInfo.EnableIso14443B==TRUE?"3B":"",
nat->discovery_cfg.PollDevInfo.PollCfgInfo.EnableFelica212==TRUE?"F2":"",
@@ -412,7 +410,7 @@
LOGD("phLibNfc_Mgt_ConfigureDiscovery callback returned 0x%08x ", nfc_jni_cb_status);
return;
}
- LOGD("phLibNfc_Mgt_ConfigureDiscovery callback returned 0x%08x ", nfc_jni_cb_status);;
+ TRACE("phLibNfc_Mgt_ConfigureDiscovery callback returned 0x%08x ", nfc_jni_cb_status);;
}
}
@@ -551,7 +549,7 @@
jbyteArray tagBytes;
f = e->GetFieldID(tag_cls, "mPollBytes", "[B");
- LOGD("psRemoteDevInfo->RemDevType %x", psRemoteDevInfo->RemDevType);
+ TRACE("psRemoteDevInfo->RemDevType %x", psRemoteDevInfo->RemDevType);
switch(psRemoteDevInfo->RemDevType)
{
/* ISO14443-3A: ATQA/SENS_RES */
@@ -676,7 +674,7 @@
nat->vm->AttachCurrentThread(&e, &thread_args);
pthread_setname_np(pthread_self(), "message");
- LOGI("NFC client started");
+ TRACE("NFC client started");
nat->running = TRUE;
while(nat->running == TRUE)
{
@@ -703,7 +701,7 @@
}
}
}
- LOGI("NFC client stopped");
+ TRACE("NFC client stopped");
nat->vm->DetachCurrentThread();
@@ -735,7 +733,7 @@
nat = (struct nfc_jni_native_data *)pContext;
- LOGD("Callback: nfc_jni_llcp_linkStatus_callback()");
+ TRACE("Callback: nfc_jni_llcp_linkStatus_callback()");
nat->vm->GetEnv( (void **)&e, nat->env_version);
@@ -783,7 +781,7 @@
if(status == NFCSTATUS_SUCCESS)
{
- LOGD("%s return status = 0x%x\n", __func__, status);
+ TRACE("%s return status = 0x%x\n", __func__, status);
sem_post(nfc_jni_llcp_sem);
}
@@ -812,11 +810,11 @@
{
PHNFC_UNUSED_VARIABLE(pContext);
- LOGD("Callback: nfc_jni_llcp_transport_listen_socket_callback()");
+ TRACE("Callback: nfc_jni_llcp_transport_listen_socket_callback()");
if(IncomingSocket != 0)
{
- LOGD("Listen CB \n");
+ TRACE("Listen CB \n");
hIncommingLlcpSocket = IncomingSocket;
sem_post(nfc_jni_llcp_listen_sem);
}
@@ -831,7 +829,7 @@
{
PHNFC_UNUSED_VARIABLE(pContext);
- LOGD("Callback: nfc_jni_llcp_transport_socket_err_callback()");
+ TRACE("Callback: nfc_jni_llcp_transport_socket_err_callback()");
if(nErrCode == PHFRINFC_LLCP_ERR_FRAME_REJECTED)
{
@@ -897,7 +895,7 @@
else
{
LOG_CALLBACK("nfc_jni_Discovery_notification_callback", status);
- LOGI("Discovered %d tags", uNofRemoteDev);
+ TRACE("Discovered %d tags", uNofRemoteDev);
if((psRemoteDevList->psRemoteDevInfo->RemDevType == phNfc_eNfcIP1_Initiator)
|| (psRemoteDevList->psRemoteDevInfo->RemDevType == phNfc_eNfcIP1_Target))
@@ -933,7 +931,7 @@
/* Set General Bytes */
f = e->GetFieldID(tag_cls, "mGeneralBytes", "[B");
- LOGD("General Bytes length =");
+ TRACE("General Bytes length =");
for(i=0;i<psRemoteDevList->psRemoteDevInfo->RemoteDevInfo.NfcIP_Info.ATRInfo_Length;i++)
{
LOGD("%02x ", psRemoteDevList->psRemoteDevInfo->RemoteDevInfo.NfcIP_Info.ATRInfo[i]);
@@ -963,7 +961,7 @@
if(status == NFCSTATUS_MULTIPLE_PROTOCOLS)
{
- LOGD("Multiple Protocol TAG detected\n");
+ TRACE("Multiple Protocol TAG detected\n");
/* Since on most multi proto cards Mifare (emu) is first, and ISO second,
* we prefer the second standard above Mifare. Proper fix is to parse it.
*/
@@ -971,7 +969,7 @@
}
else
{
- LOGD("Simple Protocol TAG detected\n");
+ TRACE("Simple Protocol TAG detected\n");
target_index = 0;
}
/* Set tag UID */
@@ -995,7 +993,7 @@
/* Set tag handle */
f = e->GetFieldID(tag_cls, "mHandle", "I");
e->SetIntField(tag, f,(jint)psRemoteDevList[target_index].hTargetDev);
- LOGD("Target handle = 0x%08x",psRemoteDevList[target_index].hTargetDev);
+ TRACE("Target handle = 0x%08x",psRemoteDevList[target_index].hTargetDev);
storedHandle = psRemoteDevList[target_index].hTargetDev;
if (nat->tag != NULL) {
e->DeleteGlobalRef(nat->tag);
@@ -1003,15 +1001,15 @@
nat->tag = e->NewGlobalRef(tag);
/* Set tag polling bytes */
- LOGD("Set Tag PollBytes");
+ TRACE("Set Tag PollBytes");
set_target_pollBytes(e, nat, tag, psRemoteDevList[target_index].psRemoteDevInfo);
/* Set tag activation bytes */
- LOGD("Set Tag ActivationBytes\n");
+ TRACE("Set Tag ActivationBytes\n");
set_target_activationBytes(e, nat, tag, psRemoteDevList[target_index].psRemoteDevInfo);
/* Notify the service */
- LOGD("Notify Nfc Service");
+ TRACE("Notify Nfc Service");
if((psRemoteDevList->psRemoteDevInfo->RemDevType == phNfc_eNfcIP1_Initiator)
|| (psRemoteDevList->psRemoteDevInfo->RemDevType == phNfc_eNfcIP1_Target))
{
@@ -1077,8 +1075,7 @@
if(status==NFCSTATUS_SUCCESS)
{
- LOGD("SE Set Mode is Successful");
- LOGD("SE Handle: %u", hSecureElement);
+ LOGD("SE Set Mode is Successful, handle: %u", hSecureElement);
}
else
{
@@ -1122,7 +1119,7 @@
e->SetByteArrayRegion((jbyteArray)aid_array, 0, aid->length, (jbyte *)aid->buffer);
}
- LOGD("Notify Nfc Service\n");
+ TRACE("Notify Nfc Service\n");
/* Notify manager that a new event occurred on a SE */
e->CallVoidMethod(nat->manager,
cached_NfcManager_notifyTransactionListeners, aid_array);
@@ -1152,13 +1149,13 @@
{
NFCSTATUS ret;
- LOGD("****** NFC Config Mode Card Emulation ******");
+ TRACE("****** NFC Config Mode Card Emulation ******");
/* Register for the card emulation mode */
REENTRANCE_LOCK();
ret = phLibNfc_SE_NtfRegister(nfc_jni_transaction_callback,(void *)nat);
REENTRANCE_UNLOCK();
- LOGD("phLibNfc_SE_NtfRegister returned 0x%x\n", ret);
+ TRACE("phLibNfc_SE_NtfRegister returned 0x%x\n", ret);
if(ret != NFCSTATUS_SUCCESS)
return;
}
@@ -1196,10 +1193,10 @@
nat->registry_info.Felica = TRUE;
nat->registry_info.NFC = FALSE;
nat->registry_info.ISO15693 = TRUE;
- LOGD("****** NFC Config Mode Reader ******");
+ TRACE("****** NFC Config Mode Reader ******");
/* LLCP Params */
- LOGD("****** NFC Config Mode NFCIP1 - LLCP ******");
+ TRACE("****** NFC Config Mode NFCIP1 - LLCP ******");
LlcpConfigInfo.miu = nat->miu;
LlcpConfigInfo.lto = nat->lto;
LlcpConfigInfo.wks = nat->wks;
@@ -1215,7 +1212,7 @@
LOGD("phLibNfc_Mgt_SetLlcp_ConfigParams returned 0x%02x",ret);
return;
}
- LOGD("phLibNfc_Mgt_SetLlcp_ConfigParams returned 0x%02x",ret);
+ TRACE("phLibNfc_Mgt_SetLlcp_ConfigParams returned 0x%02x",ret);
/* Wait for callback response */
sem_wait(nfc_jni_manager_sem);
@@ -1229,7 +1226,7 @@
LOGD("pphLibNfc_RemoteDev_NtfRegister returned 0x%02x",ret);
return;
}
- LOGD("phLibNfc_RemoteDev_NtfRegister(%s-%s-%s-%s-%s-%s-%s-%s) returned 0x%x\n",
+ TRACE("phLibNfc_RemoteDev_NtfRegister(%s-%s-%s-%s-%s-%s-%s-%s) returned 0x%x\n",
nat->registry_info.Jewel==TRUE?"J":"",
nat->registry_info.MifareUL==TRUE?"UL":"",
nat->registry_info.MifareStd==TRUE?"Mi":"",
@@ -1249,14 +1246,14 @@
LOGD("pphLibNfc_RemoteDev_NtfRegister returned 0x%02x",ret);
return;
}
- LOGD("phLibNfc_SE_NtfRegister returned 0x%x\n", ret);
+ TRACE("phLibNfc_SE_NtfRegister returned 0x%x\n", ret);
/* Start Polling loop */
- LOGD("****** Start NFC Discovery ******");
+ TRACE("****** Start NFC Discovery ******");
REENTRANCE_LOCK();
ret = phLibNfc_Mgt_ConfigureDiscovery(NFC_DISCOVERY_CONFIG,nat->discovery_cfg, nfc_jni_discover_callback, (void *)nat);
REENTRANCE_UNLOCK();
- LOGD("phLibNfc_Mgt_ConfigureDiscovery(%s-%s-%s-%s-%s-%s, %s-%x-%x) returned 0x%08x\n",
+ TRACE("phLibNfc_Mgt_ConfigureDiscovery(%s-%s-%s-%s-%s-%s, %s-%x-%x) returned 0x%08x\n",
nat->discovery_cfg.PollDevInfo.PollCfgInfo.EnableIso14443A==TRUE?"3A":"",
nat->discovery_cfg.PollDevInfo.PollCfgInfo.EnableIso14443B==TRUE?"3B":"",
nat->discovery_cfg.PollDevInfo.PollCfgInfo.EnableFelica212==TRUE?"F2":"",
@@ -1278,7 +1275,7 @@
LOGD("phLibNfc_Mgt_ConfigureDiscovery callback returned 0x%08x ", nfc_jni_cb_status);
return;
}
- LOGD("phLibNfc_Mgt_ConfigureDiscovery callback returned 0x%08x ", nfc_jni_cb_status);
+ TRACE("phLibNfc_Mgt_ConfigureDiscovery callback returned 0x%08x ", nfc_jni_cb_status);
}
@@ -1294,11 +1291,11 @@
discovery_cfg.NfcIP_Tgt_Disable = TRUE;
/* Start Polling loop */
- LOGD("****** Stop NFC Discovery ******");
+ TRACE("****** Stop NFC Discovery ******");
REENTRANCE_LOCK();
ret = phLibNfc_Mgt_ConfigureDiscovery(NFC_DISCOVERY_CONFIG,discovery_cfg, nfc_jni_discover_callback, (void *)nat);
REENTRANCE_UNLOCK();
- LOGD("phLibNfc_Mgt_ConfigureDiscovery(%s-%s-%s-%s-%s-%s, %s-%x-%x) returned 0x%08x\n",
+ TRACE("phLibNfc_Mgt_ConfigureDiscovery(%s-%s-%s-%s-%s-%s, %s-%x-%x) returned 0x%08x\n",
discovery_cfg.PollDevInfo.PollCfgInfo.EnableIso14443A==TRUE?"3A":"",
discovery_cfg.PollDevInfo.PollCfgInfo.EnableIso14443B==TRUE?"3B":"",
discovery_cfg.PollDevInfo.PollCfgInfo.EnableFelica212==TRUE?"F2":"",
@@ -1320,7 +1317,7 @@
LOGD("phLibNfc_Mgt_ConfigureDiscovery callback returned 0x%08x ", nfc_jni_cb_status);
return;
}
- LOGD("phLibNfc_Mgt_ConfigureDiscovery callback returned 0x%08x ", nfc_jni_cb_status);
+ TRACE("phLibNfc_Mgt_ConfigureDiscovery callback returned 0x%08x ", nfc_jni_cb_status);
}
@@ -1341,9 +1338,9 @@
jboolean result = JNI_FALSE;
/* Disconnect */
- LOGI("Disconnecting from tag (%x)", storedHandle);
+ TRACE("Disconnecting from tag (%x)", storedHandle);
- LOGD("phLibNfc_RemoteDev_Disconnect(%x)", storedHandle);
+ TRACE("phLibNfc_RemoteDev_Disconnect(%x)", storedHandle);
REENTRANCE_LOCK();
status = phLibNfc_RemoteDev_Disconnect(storedHandle, NFC_DISCOVERY_CONTINUE,
nfc_jni_disconnect_callback, &storedHandle);
@@ -1355,7 +1352,7 @@
storedHandle = 0;
return;
}
- LOGD("phLibNfc_RemoteDev_Disconnect(%x) returned 0x%04x[%s]", storedHandle, status, nfc_jni_get_status_name(status));
+ TRACE("phLibNfc_RemoteDev_Disconnect(%x) returned 0x%04x[%s]", storedHandle, status, nfc_jni_get_status_name(status));
/* Wait for callback response */
sem_wait(nfc_jni_manager_sem);
@@ -1363,12 +1360,12 @@
/* Disconnect Status */
if(nfc_jni_cb_status != NFCSTATUS_SUCCESS)
{
- LOGD("phLibNfc_RemoteDev_Disconnect(%x) returned 0x%04x[%s]", storedHandle, nfc_jni_cb_status, nfc_jni_get_status_name(nfc_jni_cb_status));
+ TRACE("phLibNfc_RemoteDev_Disconnect(%x) returned 0x%04x[%s]", storedHandle, nfc_jni_cb_status, nfc_jni_get_status_name(nfc_jni_cb_status));
/* Reset stored handle */
storedHandle = 0;
return;
}
- LOGD("phLibNfc_RemoteDev_Disconnect(%x) returned 0x%04x[%s]", storedHandle, nfc_jni_cb_status, nfc_jni_get_status_name(nfc_jni_cb_status));
+ TRACE("phLibNfc_RemoteDev_Disconnect(%x) returned 0x%04x[%s]", storedHandle, nfc_jni_cb_status, nfc_jni_get_status_name(nfc_jni_cb_status));
/* Reset stored handle */
storedHandle = 0;
@@ -1388,7 +1385,7 @@
if(storedHandle != 0)
{
- LOGD("Disconnect connected TAG");
+ TRACE("Disconnect connected TAG");
com_android_nfc_NfcManager_doDisconnectTag();
}
@@ -1427,7 +1424,7 @@
jobject obj;
jfieldID f;
- LOGD("****** Init Native Structure ******");
+ TRACE("****** Init Native Structure ******");
/* Initialize native structure */
nat = (nfc_jni_native_data*)malloc(sizeof(struct nfc_jni_native_data));
@@ -1474,7 +1471,7 @@
return FALSE;
}
- LOGD("****** Init Native Structure OK ******");
+ TRACE("****** Init Native Structure OK ******");
return TRUE;
}
@@ -1526,13 +1523,13 @@
memset(&nat->discovery_cfg, 0, sizeof(phLibNfc_sADD_Cfg_t));
memset(&nat->registry_info, 0, sizeof(phLibNfc_Registry_Info_t));
- LOGD("phLibNfc_Mgt_DeInitialize()");
+ TRACE("phLibNfc_Mgt_DeInitialize()");
REENTRANCE_LOCK();
status = phLibNfc_Mgt_DeInitialize(gHWRef, nfc_jni_deinit_callback, (void *)nat);
REENTRANCE_UNLOCK();
if (status == NFCSTATUS_PENDING)
{
- LOGD("phLibNfc_Mgt_DeInitialize() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
+ TRACE("phLibNfc_Mgt_DeInitialize() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
clock_gettime(CLOCK_REALTIME, &ts);
ts.tv_sec += 5;
@@ -1546,7 +1543,7 @@
}
else
{
- LOGW("phLibNfc_Mgt_DeInitialize() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
+ TRACE("phLibNfc_Mgt_DeInitialize() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
bStackReset = TRUE;
}
@@ -1558,7 +1555,7 @@
}
/* Unconfigure driver */
- LOGD("phLibNfc_Mgt_UnConfigureDriver()");
+ TRACE("phLibNfc_Mgt_UnConfigureDriver()");
REENTRANCE_LOCK();
status = phLibNfc_Mgt_UnConfigureDriver(gHWRef);
REENTRANCE_UNLOCK();
@@ -1571,7 +1568,7 @@
LOGD("phLibNfc_Mgt_UnConfigureDriver() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
}
- LOGI("NFC Deinitialized");
+ TRACE("NFC Deinitialized");
return TRUE;
}
@@ -1584,9 +1581,9 @@
phLibNfc_SE_List_t se_list[PHLIBNFC_MAXNO_OF_SE];
uint8_t i, se_count = PHLIBNFC_MAXNO_OF_SE;
- LOGD("****** Get Secure Element List ******");
+ TRACE("****** Get Secure Element List ******");
- LOGD("phLibNfc_SE_GetSecureElementList()");
+ TRACE("phLibNfc_SE_GetSecureElementList()");
REENTRANCE_LOCK();
ret = phLibNfc_SE_GetSecureElementList(se_list, &se_count);
REENTRANCE_UNLOCK();
@@ -1595,9 +1592,9 @@
LOGE("phLibNfc_SE_GetSecureElementList() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
return list;
}
- LOGD("phLibNfc_SE_GetSecureElementList() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_SE_GetSecureElementList() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
- LOGD("Nb SE: %d", se_count);
+ TRACE("Nb SE: %d", se_count);
list =e->NewIntArray(se_count);
for(i=0;i<se_count;i++)
{
@@ -1631,9 +1628,9 @@
nat = nfc_jni_get_nat(e, o);
nat->seId = seID;
- LOGD("****** Select Secure Element ******");
+ TRACE("****** Select Secure Element ******");
- LOGD("phLibNfc_SE_SetMode(0x%08x, ...)", seID);
+ TRACE("phLibNfc_SE_SetMode(0x%08x, ...)", seID);
/* Set SE mode - Virtual */
REENTRANCE_LOCK();
ret = phLibNfc_SE_SetMode(seID,phLibNfc_SE_ActModeVirtual, nfc_jni_se_set_mode_callback,(void *)nat);
@@ -1643,7 +1640,7 @@
LOGD("phLibNfc_SE_SetMode() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
goto clean_and_return;
}
- LOGD("phLibNfc_SE_SetMode() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_SE_SetMode() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
/* Wait for callback response */
sem_wait(nfc_jni_manager_sem);
@@ -1663,21 +1660,21 @@
nat = nfc_jni_get_nat(e, o);
nat->seId = 0;
- LOGD("****** Deselect Secure Element ******");
+ TRACE("****** Deselect Secure Element ******");
- LOGD("phLibNfc_SE_SetMode(0x%02x, ...)", seID);
+ TRACE("phLibNfc_SE_SetMode(0x%02x, ...)", seID);
/* Set SE mode - Off */
REENTRANCE_LOCK();
ret = phLibNfc_SE_SetMode(seID,phLibNfc_SE_ActModeOff, nfc_jni_se_set_mode_callback,(void *)nat);
REENTRANCE_UNLOCK();
- LOGD("phLibNfc_SE_SetMode for SE 0x%02x returned 0x%02x",seID, ret);
+ TRACE("phLibNfc_SE_SetMode for SE 0x%02x returned 0x%02x",seID, ret);
if(ret != NFCSTATUS_PENDING)
{
LOGE("phLibNfc_SE_SetMode() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
goto clean_and_return;
}
- LOGD("phLibNfc_SE_SetMode() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_SE_SetMode() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
/* Wait for callback response */
sem_wait(nfc_jni_manager_sem);
@@ -1712,7 +1709,7 @@
nat = nfc_jni_get_nat(e, o);
/* Check LLCP compliancy */
- LOGD("phLibNfc_Llcp_CheckLlcp(hLlcpHandle=0x%08x)", hLlcpHandle);
+ TRACE("phLibNfc_Llcp_CheckLlcp(hLlcpHandle=0x%08x)", hLlcpHandle);
REENTRANCE_LOCK();
ret = phLibNfc_Llcp_CheckLlcp(hLlcpHandle,
nfc_jni_checkLlcp_callback,
@@ -1726,7 +1723,7 @@
LOGE("phLibNfc_Llcp_CheckLlcp() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
goto clean_and_return;
}
- LOGD("phLibNfc_Llcp_CheckLlcp() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_Llcp_CheckLlcp() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
/* Wait for callback response */
sem_wait(nfc_jni_llcp_sem);
@@ -1744,13 +1741,13 @@
static jboolean com_android_nfc_NfcManager_doActivateLlcp(JNIEnv *e, jobject o)
{
NFCSTATUS ret;
- LOGD("phLibNfc_Llcp_Activate(hRemoteDevice=0x%08x)", hLlcpHandle);
+ TRACE("phLibNfc_Llcp_Activate(hRemoteDevice=0x%08x)", hLlcpHandle);
REENTRANCE_LOCK();
ret = phLibNfc_Llcp_Activate(hLlcpHandle);
REENTRANCE_UNLOCK();
if(ret == NFCSTATUS_SUCCESS)
{
- LOGD("phLibNfc_Llcp_Activate() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_Llcp_Activate() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
return JNI_TRUE;
}
else
@@ -1775,7 +1772,7 @@
nat = nfc_jni_get_nat(e, o);
/* Create socket */
- LOGD("phLibNfc_Llcp_Socket(hRemoteDevice=0x%08x, eType=phFriNfc_LlcpTransport_eConnectionLess, ...)", hLlcpHandle);
+ TRACE("phLibNfc_Llcp_Socket(hRemoteDevice=0x%08x, eType=phFriNfc_LlcpTransport_eConnectionLess, ...)", hLlcpHandle);
REENTRANCE_LOCK();
ret = phLibNfc_Llcp_Socket(hLlcpHandle,
phFriNfc_LlcpTransport_eConnectionLess,
@@ -1792,11 +1789,11 @@
LOGE("phLibNfc_Llcp_Socket() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
return NULL;
}
- LOGD("phLibNfc_Llcp_Socket() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_Llcp_Socket() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
/* Bind socket */
- LOGD("phLibNfc_Llcp_Bind(hSocket=0x%08x, nSap=0x%02x)", hLlcpSocket, nSap);
+ TRACE("phLibNfc_Llcp_Bind(hSocket=0x%08x, nSap=0x%02x)", hLlcpSocket, nSap);
REENTRANCE_LOCK();
ret = phLibNfc_Llcp_Bind(hLlcpSocket,nSap);
REENTRANCE_UNLOCK();
@@ -1810,7 +1807,7 @@
REENTRANCE_UNLOCK();
return NULL;
}
- LOGD("phLibNfc_Llcp_Bind() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_Llcp_Bind() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
/* Create new NativeLlcpConnectionlessSocket object */
@@ -1829,17 +1826,17 @@
/* Set socket handle */
f = e->GetFieldID(clsNativeConnectionlessSocket, "mHandle", "I");
e->SetIntField(connectionlessSocket, f,(jint)hLlcpSocket);
- LOGD("Connectionless socket Handle = %02x\n",hLlcpSocket);
+ TRACE("Connectionless socket Handle = %02x\n",hLlcpSocket);
/* Set the miu link of the connectionless socket */
f = e->GetFieldID(clsNativeConnectionlessSocket, "mLinkMiu", "I");
e->SetIntField(connectionlessSocket, f,(jint)PHFRINFC_LLCP_MIU_DEFAULT);
- LOGD("Connectionless socket Link MIU = %d\n",PHFRINFC_LLCP_MIU_DEFAULT);
+ TRACE("Connectionless socket Link MIU = %d\n",PHFRINFC_LLCP_MIU_DEFAULT);
/* Set socket SAP */
f = e->GetFieldID(clsNativeConnectionlessSocket, "mSap", "I");
e->SetIntField(connectionlessSocket, f,(jint)nSap);
- LOGD("Connectionless socket SAP = %d\n",nSap);
+ TRACE("Connectionless socket SAP = %d\n",nSap);
return connectionlessSocket;
}
@@ -1869,7 +1866,7 @@
/* Create socket */
- LOGD("phLibNfc_Llcp_Socket(hRemoteDevice=0x%08x, eType=phFriNfc_LlcpTransport_eConnectionOriented, ...)", hLlcpHandle);
+ TRACE("phLibNfc_Llcp_Socket(hRemoteDevice=0x%08x, eType=phFriNfc_LlcpTransport_eConnectionOriented, ...)", hLlcpHandle);
REENTRANCE_LOCK();
ret = phLibNfc_Llcp_Socket(hLlcpHandle,
phFriNfc_LlcpTransport_eConnectionOriented,
@@ -1886,10 +1883,10 @@
lastErrorStatus = ret;
return NULL;
}
- LOGD("phLibNfc_Llcp_Socket() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_Llcp_Socket() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
/* Bind socket */
- LOGD("phLibNfc_Llcp_Bind(hSocket=0x%08x, nSap=0x%02x)", hLlcpSocket, nSap);
+ TRACE("phLibNfc_Llcp_Bind(hSocket=0x%08x, nSap=0x%02x)", hLlcpSocket, nSap);
REENTRANCE_LOCK();
ret = phLibNfc_Llcp_Bind(hLlcpSocket,nSap);
REENTRANCE_UNLOCK();
@@ -1901,7 +1898,7 @@
ret = phLibNfc_Llcp_Close(hLlcpSocket);
return NULL;
}
- LOGD("phLibNfc_Llcp_Bind() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_Llcp_Bind() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
/* Service socket */
if (sn == NULL) {
@@ -1912,7 +1909,7 @@
serviceName.length = (uint32_t)e->GetStringUTFLength(sn);
}
- LOGD("phLibNfc_Llcp_Listen(hSocket=0x%08x, ...)", hLlcpSocket);
+ TRACE("phLibNfc_Llcp_Listen(hSocket=0x%08x, ...)", hLlcpSocket);
REENTRANCE_LOCK();
ret = phLibNfc_Llcp_Listen( hLlcpSocket,
&serviceName,
@@ -1930,7 +1927,7 @@
REENTRANCE_UNLOCK();
return NULL;
}
- LOGD("phLibNfc_Llcp_Listen() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_Llcp_Listen() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
/* Create new NativeLlcpServiceSocket object */
if(nfc_jni_cache_object(e,"com/android/nfc/NativeLlcpServiceSocket",&(serviceSocket)) == -1)
@@ -1950,22 +1947,22 @@
/* Set socket handle */
f = e->GetFieldID(clsNativeLlcpServiceSocket, "mHandle", "I");
e->SetIntField(serviceSocket, f,(jint)hLlcpSocket);
- LOGD("Service socket Handle = %02x\n",hLlcpSocket);
+ TRACE("Service socket Handle = %02x\n",hLlcpSocket);
/* Set socket linear buffer length */
f = e->GetFieldID(clsNativeLlcpServiceSocket, "mLocalLinearBufferLength", "I");
e->SetIntField(serviceSocket, f,(jint)linearBufferLength);
- LOGD("Service socket Linear buffer length = %02x\n",linearBufferLength);
+ TRACE("Service socket Linear buffer length = %02x\n",linearBufferLength);
/* Set socket MIU */
f = e->GetFieldID(clsNativeLlcpServiceSocket, "mLocalMiu", "I");
e->SetIntField(serviceSocket, f,(jint)miu);
- LOGD("Service socket MIU = %d\n",miu);
+ TRACE("Service socket MIU = %d\n",miu);
/* Set socket RW */
f = e->GetFieldID(clsNativeLlcpServiceSocket, "mLocalRw", "I");
e->SetIntField(serviceSocket, f,(jint)rw);
- LOGD("Service socket RW = %d\n",rw);
+ TRACE("Service socket RW = %d\n",rw);
return serviceSocket;
}
@@ -1993,7 +1990,7 @@
sWorkingBuffer.buffer = (uint8_t*)malloc(sWorkingBuffer.length);
/* Create socket */
- LOGD("phLibNfc_Llcp_Socket(hRemoteDevice=0x%08x, eType=phFriNfc_LlcpTransport_eConnectionOriented, ...)", hLlcpHandle);
+ TRACE("phLibNfc_Llcp_Socket(hRemoteDevice=0x%08x, eType=phFriNfc_LlcpTransport_eConnectionOriented, ...)", hLlcpHandle);
REENTRANCE_LOCK();
ret = phLibNfc_Llcp_Socket(hLlcpHandle,
phFriNfc_LlcpTransport_eConnectionOriented,
@@ -2010,7 +2007,7 @@
lastErrorStatus = ret;
return NULL;
}
- LOGD("phLibNfc_Llcp_Socket() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_Llcp_Socket() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
/* Create new NativeLlcpSocket object */
if(nfc_jni_cache_object(e,"com/android/nfc/NativeLlcpSocket",&(clientSocket)) == -1)
@@ -2031,7 +2028,7 @@
if(nSap != 0)
{
/* Bind socket */
- LOGD("phLibNfc_Llcp_Bind(hSocket=0x%08x, nSap=0x%02x)", hLlcpSocket, nSap);
+ TRACE("phLibNfc_Llcp_Bind(hSocket=0x%08x, nSap=0x%02x)", hLlcpSocket, nSap);
REENTRANCE_LOCK();
ret = phLibNfc_Llcp_Bind(hLlcpSocket,nSap);
REENTRANCE_UNLOCK();
@@ -2045,28 +2042,28 @@
REENTRANCE_UNLOCK();
return NULL;
}
- LOGD("phLibNfc_Llcp_Bind() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_Llcp_Bind() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
/* Set socket SAP */
f = e->GetFieldID(clsNativeLlcpSocket, "mSap", "I");
e->SetIntField(clientSocket, f,(jint)nSap);
- LOGD("socket SAP = %d\n",nSap);
+ TRACE("socket SAP = %d\n",nSap);
}
/* Set socket handle */
f = e->GetFieldID(clsNativeLlcpSocket, "mHandle", "I");
e->SetIntField(clientSocket, f,(jint)hLlcpSocket);
- LOGD("socket Handle = %02x\n",hLlcpSocket);
+ TRACE("socket Handle = %02x\n",hLlcpSocket);
/* Set socket MIU */
f = e->GetFieldID(clsNativeLlcpSocket, "mLocalMiu", "I");
e->SetIntField(clientSocket, f,(jint)miu);
- LOGD("socket MIU = %d\n",miu);
+ TRACE("socket MIU = %d\n",miu);
/* Set socket RW */
f = e->GetFieldID(clsNativeLlcpSocket, "mLocalRw", "I");
e->SetIntField(clientSocket, f,(jint)rw);
- LOGD("socket RW = %d\n",rw);
+ TRACE("socket RW = %d\n",rw);
return clientSocket;
@@ -2074,7 +2071,7 @@
static jint com_android_nfc_NfcManager_doGetLastError(JNIEnv *e, jobject o)
{
- LOGW("Last Error Status = 0x%02x",lastErrorStatus);
+ TRACE("Last Error Status = 0x%02x",lastErrorStatus);
if(lastErrorStatus == NFCSTATUS_BUFFER_TOO_SMALL)
{
@@ -2102,61 +2099,61 @@
{
case PROPERTY_LLCP_LTO:
{
- LOGD("> Set LLCP LTO to %d",value);
+ TRACE("> Set LLCP LTO to %d",value);
nat->lto = value;
}break;
case PROPERTY_LLCP_MIU:
{
- LOGD("> Set LLCP MIU to %d",value);
+ TRACE("> Set LLCP MIU to %d",value);
nat->miu = value;
}break;
case PROPERTY_LLCP_WKS:
{
- LOGD("> Set LLCP WKS to %d",value);
+ TRACE("> Set LLCP WKS to %d",value);
nat->wks = value;
}break;
case PROPERTY_LLCP_OPT:
{
- LOGD("> Set LLCP OPT to %d",value);
+ TRACE("> Set LLCP OPT to %d",value);
nat->opt = value;
}break;
case PROPERTY_NFC_DISCOVERY_A:
{
- LOGD("> Set NFC DISCOVERY A to %d",value);
+ TRACE("> Set NFC DISCOVERY A to %d",value);
nat->discovery_cfg.PollDevInfo.PollCfgInfo.EnableIso14443A = value;
}break;
case PROPERTY_NFC_DISCOVERY_B:
{
- LOGD("> Set NFC DISCOVERY B to %d",value);
+ TRACE("> Set NFC DISCOVERY B to %d",value);
nat->discovery_cfg.PollDevInfo.PollCfgInfo.EnableIso14443B = value;
}break;
case PROPERTY_NFC_DISCOVERY_F:
{
- LOGD("> Set NFC DISCOVERY F to %d",value);
+ TRACE("> Set NFC DISCOVERY F to %d",value);
nat->discovery_cfg.PollDevInfo.PollCfgInfo.EnableFelica212 = value;
nat->discovery_cfg.PollDevInfo.PollCfgInfo.EnableFelica424 = value;
}break;
case PROPERTY_NFC_DISCOVERY_15693:
{
- LOGD("> Set NFC DISCOVERY 15693 to %d",value);
+ TRACE("> Set NFC DISCOVERY 15693 to %d",value);
nat->discovery_cfg.PollDevInfo.PollCfgInfo.EnableIso15693 = value;
}break;
case PROPERTY_NFC_DISCOVERY_NCFIP:
{
- LOGD("> Set NFC DISCOVERY NFCIP to %d",value);
+ TRACE("> Set NFC DISCOVERY NFCIP to %d",value);
nat->discovery_cfg.PollDevInfo.PollCfgInfo.EnableNfcActive = value;
}break;
default:
{
- LOGW("> Unknown Property ");
+ TRACE("> Unknown Property ");
}break;
}
diff --git a/jni/com_android_nfc_NativeNfcTag.cpp b/jni/com_android_nfc_NativeNfcTag.cpp
index 7f9e732..38a265c 100644
--- a/jni/com_android_nfc_NativeNfcTag.cpp
+++ b/jni/com_android_nfc_NativeNfcTag.cpp
@@ -131,9 +131,9 @@
if(status != NFCSTATUS_SUCCESS)
{
/* Disconnect & Restart Polling loop */
- LOGI("Tag removed from the RF Field\n");
+ TRACE("Tag removed from the RF Field\n");
- LOGD("phLibNfc_RemoteDev_Disconnect(async)");
+ TRACE("phLibNfc_RemoteDev_Disconnect(async)");
REENTRANCE_LOCK();
ret = phLibNfc_RemoteDev_Disconnect(handle, NFC_DISCOVERY_CONTINUE, nfc_jni_async_disconnect_callback,(void*)handle);
REENTRANCE_UNLOCK();
@@ -144,11 +144,11 @@
nfc_jni_restart_discovery_locked(nfc_jni_get_nat_ext(env));
return;
}
- LOGD("phLibNfc_RemoteDev_Disconnect() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_RemoteDev_Disconnect() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
}
else
{
- LOGD("phLibNfc_RemoteDev_CheckPresence(async)");
+ TRACE("phLibNfc_RemoteDev_CheckPresence(async)");
/* Presence Check */
REENTRANCE_LOCK();
ret = phLibNfc_RemoteDev_CheckPresence(handle,nfc_jni_async_presence_check_callback, (void*)env);
@@ -158,7 +158,7 @@
LOGE("phLibNfc_RemoteDev_CheckPresence() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
return;
}
- LOGD("phLibNfc_RemoteDev_CheckPresence() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
+ TRACE("phLibNfc_RemoteDev_CheckPresence() returned 0x%04x[%s]", ret, nfc_jni_get_status_name(ret));
}
}
@@ -201,7 +201,7 @@
nfc_jni_ndef_rw.length = nfc_jni_ndef_buf_len;
nfc_jni_ndef_rw.buffer = nfc_jni_ndef_buf;
- LOGD("phLibNfc_Ndef_Read()");
+ TRACE("phLibNfc_Ndef_Read()");
REENTRANCE_LOCK();
status = phLibNfc_Ndef_Read(handle, &nfc_jni_ndef_rw,
phLibNfc_Ndef_EBegin,
@@ -213,7 +213,7 @@
LOGE("phLibNfc_Ndef_Read() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
goto clean_and_return;
}
- LOGD("phLibNfc_Ndef_Read() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
+ TRACE("phLibNfc_Ndef_Read() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
/* Wait for callback response */
sem_wait(nfc_jni_tag_sem);
@@ -248,9 +248,9 @@
nfc_jni_ndef_rw.length = (uint32_t)e->GetArrayLength(buf);
nfc_jni_ndef_rw.buffer = (uint8_t *)e->GetByteArrayElements(buf, NULL);
- LOGD("phLibNfc_Ndef_Write()");
- LOGD("Ndef Handle :0x%x\n",handle);
- LOGD("Ndef buffer length : %d", nfc_jni_ndef_rw.length);
+ TRACE("phLibNfc_Ndef_Write()");
+ TRACE("Ndef Handle :0x%x\n",handle);
+ TRACE("Ndef buffer length : %d", nfc_jni_ndef_rw.length);
REENTRANCE_LOCK();
status = phLibNfc_Ndef_Write(handle, &nfc_jni_ndef_rw,nfc_jni_tag_rw_callback, (void *)e);
REENTRANCE_UNLOCK();
@@ -259,7 +259,7 @@
LOGE("phLibNfc_Ndef_Write() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
goto clean_and_return;
}
- LOGD("phLibNfc_Ndef_Write() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
+ TRACE("phLibNfc_Ndef_Write() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
/* Wait for callback response */
sem_wait(nfc_jni_tag_sem);
@@ -293,7 +293,7 @@
handle = nfc_jni_get_nfc_tag_handle(e, o);
- LOGD("phLibNfc_RemoteDev_Connect(RW)");
+ TRACE("phLibNfc_RemoteDev_Connect(RW)");
REENTRANCE_LOCK();
status = phLibNfc_RemoteDev_Connect(handle, nfc_jni_connect_callback,(void *)e);
REENTRANCE_UNLOCK();
@@ -302,7 +302,7 @@
LOGE("phLibNfc_RemoteDev_Connect(RW) returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
goto clean_and_return;
}
- LOGD("phLibNfc_RemoteDev_Connect(RW) returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
+ TRACE("phLibNfc_RemoteDev_Connect(RW) returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
/* Wait for callback response */
sem_wait(nfc_jni_tag_sem);
@@ -336,12 +336,12 @@
storedHandle = 0;
/* Disconnect */
- LOGI("Disconnecting from tag (%x)", handle);
+ TRACE("Disconnecting from tag (%x)", handle);
/* Presence Check */
do
{
- LOGD("phLibNfc_RemoteDev_CheckPresence(%x)", handle);
+ TRACE("phLibNfc_RemoteDev_CheckPresence(%x)", handle);
REENTRANCE_LOCK();
status = phLibNfc_RemoteDev_CheckPresence(handle,nfc_jni_presence_check_callback,(void *)e);
REENTRANCE_UNLOCK();
@@ -351,15 +351,15 @@
/* Disconnect Tag */
break;
}
- LOGD("phLibNfc_RemoteDev_CheckPresence(%x) returned 0x%04x[%s]", handle, status, nfc_jni_get_status_name(status));
+ TRACE("phLibNfc_RemoteDev_CheckPresence(%x) returned 0x%04x[%s]", handle, status, nfc_jni_get_status_name(status));
/* Wait for callback response */
sem_wait(nfc_jni_tag_sem);
} while(nfc_jni_cb_status == NFCSTATUS_SUCCESS);
- LOGI("Tag removed from the RF Field\n");
+ TRACE("Tag removed from the RF Field\n");
- LOGD("phLibNfc_RemoteDev_Disconnect(%x)", handle);
+ TRACE("phLibNfc_RemoteDev_Disconnect(%x)", handle);
REENTRANCE_LOCK();
status = phLibNfc_RemoteDev_Disconnect(handle, NFC_DISCOVERY_CONTINUE,
nfc_jni_disconnect_callback, (void *)e);
@@ -368,7 +368,7 @@
if(status == NFCSTATUS_TARGET_NOT_CONNECTED)
{
result = JNI_TRUE;
- LOGD("phLibNfc_RemoteDev_Disconnect() - Target already disconnected");
+ TRACE("phLibNfc_RemoteDev_Disconnect() - Target already disconnected");
goto clean_and_return;
}
if(status != NFCSTATUS_PENDING)
@@ -377,7 +377,7 @@
nfc_jni_restart_discovery_locked(nfc_jni_get_nat_ext(e));
goto clean_and_return;
}
- LOGD("phLibNfc_RemoteDev_Disconnect(%x) returned 0x%04x[%s]", handle, status, nfc_jni_get_status_name(status));
+ TRACE("phLibNfc_RemoteDev_Disconnect(%x) returned 0x%04x[%s]", handle, status, nfc_jni_get_status_name(status));
/* Wait for callback response */
sem_wait(nfc_jni_tag_sem);
@@ -385,10 +385,10 @@
/* Disconnect Status */
if(nfc_jni_cb_status != NFCSTATUS_SUCCESS)
{
- LOGD("phLibNfc_RemoteDev_Disconnect(%x) returned 0x%04x[%s]", handle, nfc_jni_cb_status, nfc_jni_get_status_name(nfc_jni_cb_status));
+ TRACE("phLibNfc_RemoteDev_Disconnect(%x) returned 0x%04x[%s]", handle, nfc_jni_cb_status, nfc_jni_get_status_name(nfc_jni_cb_status));
goto clean_and_return;
}
- LOGD("phLibNfc_RemoteDev_Disconnect(%x) returned 0x%04x[%s]", handle, nfc_jni_cb_status, nfc_jni_get_status_name(nfc_jni_cb_status));
+ TRACE("phLibNfc_RemoteDev_Disconnect(%x) returned 0x%04x[%s]", handle, nfc_jni_cb_status, nfc_jni_get_status_name(nfc_jni_cb_status));
result = JNI_TRUE;
clean_and_return:
@@ -412,7 +412,7 @@
CONCURRENCY_LOCK();
- LOGD("Tag %s\n", str);
+ TRACE("Tag %s\n", str);
buf = (uint8_t *)e->GetByteArrayElements(data, NULL);
buflen = (uint32_t)e->GetArrayLength(data);
@@ -453,7 +453,7 @@
goto clean_and_return;
}
- LOGD("phLibNfc_RemoteDev_Transceive()");
+ TRACE("phLibNfc_RemoteDev_Transceive()");
REENTRANCE_LOCK();
status = phLibNfc_RemoteDev_Transceive(handle, &transceive_info,
nfc_jni_transceive_callback, (void *)e);
@@ -463,7 +463,7 @@
LOGE("phLibNfc_RemoteDev_Transceive() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
goto clean_and_return;
}
- LOGD("phLibNfc_RemoteDev_Transceive() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
+ TRACE("phLibNfc_RemoteDev_Transceive() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
/* Wait for callback response */
sem_wait(nfc_jni_tag_sem);
@@ -507,7 +507,7 @@
handle = nfc_jni_get_nfc_tag_handle(e, o);
- LOGD("phLibNfc_Ndef_CheckNdef()");
+ TRACE("phLibNfc_Ndef_CheckNdef()");
REENTRANCE_LOCK();
status = phLibNfc_Ndef_CheckNdef(handle, nfc_jni_checkndef_callback,(void *)e);
REENTRANCE_UNLOCK();
@@ -516,7 +516,7 @@
LOGE("phLibNfc_Ndef_CheckNdef() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
goto clean_and_return;
}
- LOGD("phLibNfc_Ndef_CheckNdef() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
+ TRACE("phLibNfc_Ndef_CheckNdef() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
/* Wait for callback response */
sem_wait(nfc_jni_tag_sem);
@@ -542,7 +542,7 @@
handle = nfc_jni_get_nfc_tag_handle(e, o);
- LOGD("phLibNfc_RemoteDev_CheckPresence()");
+ TRACE("phLibNfc_RemoteDev_CheckPresence()");
REENTRANCE_LOCK();
status = phLibNfc_RemoteDev_CheckPresence(handle, nfc_jni_presencecheck_callback, (void *)e);
REENTRANCE_UNLOCK();
@@ -552,7 +552,7 @@
LOGE("phLibNfc_RemoteDev_CheckPresence() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
goto clean_and_return;
}
- LOGD("phLibNfc_RemoteDev_CheckPresence() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
+ TRACE("phLibNfc_RemoteDev_CheckPresence() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
/* Wait for callback response */
sem_wait(nfc_jni_tag_sem);
diff --git a/jni/com_android_nfc_NativeP2pDevice.cpp b/jni/com_android_nfc_NativeP2pDevice.cpp
index 61accfb..796d914 100644
--- a/jni/com_android_nfc_NativeP2pDevice.cpp
+++ b/jni/com_android_nfc_NativeP2pDevice.cpp
@@ -44,9 +44,6 @@
phLibNfc_Handle hRemoteDev,
phLibNfc_sRemoteDevInformation_t *psRemoteDevInfo, NFCSTATUS status)
{
-
-
-
LOG_CALLBACK("nfc_jni_connect_callback", status);
if(status == NFCSTATUS_SUCCESS)
@@ -129,7 +126,7 @@
handle = nfc_jni_get_p2p_device_handle(e, o);
- LOGD("phLibNfc_RemoteDev_Connect(P2P)");
+ TRACE("phLibNfc_RemoteDev_Connect(P2P)");
REENTRANCE_LOCK();
status = phLibNfc_RemoteDev_Connect(handle, nfc_jni_connect_callback, (void*)e);
REENTRANCE_UNLOCK();
@@ -139,7 +136,7 @@
nfc_jni_restart_discovery_locked(nfc_jni_get_nat_ext(e));
goto clean_and_return;
}
- LOGD("phLibNfc_RemoteDev_Connect(P2P) returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
+ TRACE("phLibNfc_RemoteDev_Connect(P2P) returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
/* Wait for callback response */
sem_wait(nfc_jni_peer_sem);
@@ -155,11 +152,11 @@
f = e->GetFieldID(target_cls, "mGeneralBytes", "[B");
- LOGD("General Bytes Length = %d", sGeneralBytes.length);
- LOGD("General Bytes =");
+ TRACE("General Bytes Length = %d", sGeneralBytes.length);
+ TRACE("General Bytes =");
for(i=0;i<sGeneralBytes.length;i++)
{
- LOGD("0x%02x ", sGeneralBytes.buffer[i]);
+ TRACE("0x%02x ", sGeneralBytes.buffer[i]);
}
@@ -188,14 +185,14 @@
handle = nfc_jni_get_p2p_device_handle(e, o);
/* Disconnect */
- LOGD("Disconnecting from target (handle = 0x%x)", handle);
+ TRACE("Disconnecting from target (handle = 0x%x)", handle);
/* NativeNfcTag waits for tag to leave the field here with presence check.
* We do not in P2P path because presence check is not safe while transceive may be
* in progress.
*/
- LOGD("phLibNfc_RemoteDev_Disconnect()");
+ TRACE("phLibNfc_RemoteDev_Disconnect()");
REENTRANCE_LOCK();
status = phLibNfc_RemoteDev_Disconnect(handle, NFC_DISCOVERY_CONTINUE,nfc_jni_disconnect_callback, (void *)e);
REENTRANCE_UNLOCK();
@@ -205,7 +202,7 @@
nfc_jni_restart_discovery_locked(nfc_jni_get_nat_ext(e));
goto clean_and_return;
}
- LOGD("phLibNfc_RemoteDev_Disconnect() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
+ TRACE("phLibNfc_RemoteDev_Disconnect() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
/* Wait for callback response */
sem_wait(nfc_jni_peer_sem);
@@ -216,7 +213,7 @@
LOGD("phLibNfc_RemoteDev_Disconnect() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
goto clean_and_return;
}
- LOGD("phLibNfc_RemoteDev_Disconnect() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
+ TRACE("phLibNfc_RemoteDev_Disconnect() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
result = JNI_TRUE;
clean_and_return:
@@ -238,12 +235,12 @@
CONCURRENCY_LOCK();
/* Transceive*/
- LOGD("Transceive data to target (handle = 0x%x)", handle);
+ TRACE("Transceive data to target (handle = 0x%x)", handle);
buf = (uint8_t *)e->GetByteArrayElements(data, NULL);
buflen = (uint32_t)e->GetArrayLength(data);
- LOGD("Buffer Length = %d\n", buflen);
+ TRACE("Buffer Length = %d\n", buflen);
transceive_info.sSendData.buffer = buf; //+ offset;
transceive_info.sSendData.length = buflen; //- offset;
@@ -255,7 +252,7 @@
goto clean_and_return;
}
- LOGD("phLibNfc_RemoteDev_Transceive(P2P)");
+ TRACE("phLibNfc_RemoteDev_Transceive(P2P)");
REENTRANCE_LOCK();
status = phLibNfc_RemoteDev_Transceive(handle, &transceive_info, nfc_jni_transceive_callback, (void *)e);
REENTRANCE_UNLOCK();
@@ -264,7 +261,7 @@
LOGE("phLibNfc_RemoteDev_Transceive(P2P) returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
goto clean_and_return;
}
- LOGD("phLibNfc_RemoteDev_Transceive(P2P) returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
+ TRACE("phLibNfc_RemoteDev_Transceive(P2P) returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
/* Wait for callback response */
sem_wait(nfc_jni_peer_sem);
@@ -281,7 +278,7 @@
(jbyte *)nfc_jni_transceive_buffer->buffer);
clean_and_return:
- LOGD("P2P Transceive status = 0x%08x",nfc_jni_cb_status);
+ TRACE("P2P Transceive status = 0x%08x",nfc_jni_cb_status);
if(transceive_info.sRecvData.buffer != NULL)
free(transceive_info.sRecvData.buffer);
@@ -308,7 +305,7 @@
handle = nfc_jni_get_p2p_device_handle(e, o);
/* Receive */
- LOGD("phLibNfc_RemoteDev_Receive()");
+ TRACE("phLibNfc_RemoteDev_Receive()");
REENTRANCE_LOCK();
status = phLibNfc_RemoteDev_Receive(handle, nfc_jni_receive_callback,(void *)&data);
REENTRANCE_UNLOCK();
@@ -317,7 +314,7 @@
LOGE("phLibNfc_RemoteDev_Receive() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
goto clean_and_return;
}
- LOGD("phLibNfc_RemoteDev_Receive() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
+ TRACE("phLibNfc_RemoteDev_Receive() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
/* Wait for callback response */
if(sem_wait(nfc_jni_peer_sem) == -1)
@@ -350,12 +347,12 @@
CONCURRENCY_LOCK();
/* Send */
- LOGD("Send data to the Initiator (handle = 0x%x)", handle);
+ TRACE("Send data to the Initiator (handle = 0x%x)", handle);
data.length = (uint32_t)e->GetArrayLength(buf);
data.buffer = (uint8_t *)e->GetByteArrayElements(buf, NULL);
- LOGD("phLibNfc_RemoteDev_Send()");
+ TRACE("phLibNfc_RemoteDev_Send()");
REENTRANCE_LOCK();
status = phLibNfc_RemoteDev_Send(handle, &data, nfc_jni_send_callback,(void *)e);
REENTRANCE_UNLOCK();
@@ -364,7 +361,7 @@
LOGE("phLibNfc_RemoteDev_Send() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
goto clean_and_return;
}
- LOGD("phLibNfc_RemoteDev_Send() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
+ TRACE("phLibNfc_RemoteDev_Send() returned 0x%04x[%s]", status, nfc_jni_get_status_name(status));
/* Wait for callback response */
sem_wait(nfc_jni_peer_sem);
diff --git a/src/com/android/nfc/NativeNfcTag.java b/src/com/android/nfc/NativeNfcTag.java
index 43ef644..075fdf3 100755
--- a/src/com/android/nfc/NativeNfcTag.java
+++ b/src/com/android/nfc/NativeNfcTag.java
@@ -22,6 +22,8 @@
* Native interface to the NFC tag functions
*/
public class NativeNfcTag {
+ static final boolean DBG = false;
+
private int mHandle;
private String mType;
@@ -51,7 +53,7 @@
@Override
public void run() {
- Log.d(TAG, "Starting background presence check");
+ if (DBG) Log.d(TAG, "Starting background presence check");
while (isPresent && isRunning) {
try {
Thread.sleep(1000);
@@ -65,7 +67,7 @@
Log.d(TAG, "Tag lost, restarting polling loop");
doDisconnect();
}
- Log.d(TAG, "Stopping background presence check");
+ if (DBG) Log.d(TAG, "Stopping background presence check");
}
}
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index f373285..6788b69 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -53,7 +53,7 @@
import java.util.ListIterator;
public class NfcService extends Application {
- private static final String MY_TAG_FILE_NAME = "mytag";
+ static final boolean DBG = false;
static {
System.loadLibrary("nfc_jni");
@@ -246,12 +246,12 @@
boolean isSuccess = false;
mContext.enforceCallingOrSelfPermission(ADMIN_PERM, ADMIN_PERM_ERROR);
boolean previouslyEnabled = isEnabled();
- Log.d(TAG, "Disabling NFC. previous=" + previouslyEnabled);
+ if (DBG) Log.d(TAG, "Disabling NFC. previous=" + previouslyEnabled);
if (previouslyEnabled) {
/* tear down the my tag server */
isSuccess = mManager.deinitialize();
- Log.d(TAG, "NFC success of deinitialize = " + isSuccess);
+ if (DBG) Log.d(TAG, "NFC success of deinitialize = " + isSuccess);
if (isSuccess) {
mIsNfcEnabled = false;
}
@@ -422,7 +422,7 @@
/* update socket handle generation */
mGeneratedSocketHandle += 1;
- Log.d(TAG, "Llcp Service Socket Handle =" + sockeHandle);
+ if (DBG) Log.d(TAG, "Llcp Service Socket Handle =" + sockeHandle);
return sockeHandle;
} else {
/* No socket available */
@@ -445,7 +445,7 @@
int sockeHandle = mGeneratedSocketHandle;
if (mLlcpLinkState == NfcAdapter.LLCP_LINK_STATE_ACTIVATED) {
- Log.d(TAG, "creating llcp socket while activated");
+ if (DBG) Log.d(TAG, "creating llcp socket while activated");
NativeLlcpSocket socket;
socket = mManager.doCreateLlcpSocket(sap, miu, rw, linearBufferLength);
@@ -479,7 +479,7 @@
}
}
} else {
- Log.d(TAG, "registering llcp socket while not activated");
+ if (DBG) Log.d(TAG, "registering llcp socket while not activated");
/* Check SAP is not already used */
if (!CheckSocketSap(sap)) {
@@ -1855,7 +1855,7 @@
if (registeredSocket.mHandle == nativeHandle) {
/* remove the registered socket from the list */
it.remove();
- Log.d(TAG, "socket removed");
+ if (DBG) Log.d(TAG, "socket removed");
}
}
}
@@ -1941,7 +1941,7 @@
/* check if sockets are registered */
ListIterator<RegisteredSocket> it = mRegisteredSocketList.listIterator();
- Log.d(TAG, "Nb socket resgistered = " + mRegisteredSocketList.size());
+ if (DBG) Log.d(TAG, "Nb socket resgistered = " + mRegisteredSocketList.size());
/* Mark the link state */
mLlcpLinkState = NfcAdapter.LLCP_LINK_STATE_ACTIVATED;
@@ -1951,8 +1951,8 @@
switch (registeredSocket.mType) {
case LLCP_SERVICE_SOCKET_TYPE:
- Log.d(TAG, "Registered Llcp Service Socket");
- Log.d(TAG, "SAP: " + registeredSocket.mSap + ", SN: " + registeredSocket.mServiceName);
+ if (DBG) Log.d(TAG, "Registered Llcp Service Socket");
+ if (DBG) Log.d(TAG, "SAP: " + registeredSocket.mSap + ", SN: " + registeredSocket.mServiceName);
NativeLlcpServiceSocket serviceSocket;
serviceSocket = mManager.doCreateLlcpServiceSocket(
@@ -1961,7 +1961,7 @@
registeredSocket.mlinearBufferLength);
if (serviceSocket != null) {
- Log.d(TAG, "service socket created");
+ if (DBG) Log.d(TAG, "service socket created");
/* Add the socket into the socket map */
synchronized(NfcService.this) {
mSocketMap.put(registeredSocket.mHandle, serviceSocket);
@@ -1979,13 +1979,13 @@
break;
case LLCP_SOCKET_TYPE:
- Log.d(TAG, "Registered Llcp Socket");
+ if (DBG) Log.d(TAG, "Registered Llcp Socket");
NativeLlcpSocket clientSocket;
clientSocket = mManager.doCreateLlcpSocket(registeredSocket.mSap,
registeredSocket.mMiu, registeredSocket.mRw,
registeredSocket.mlinearBufferLength);
if (clientSocket != null) {
- Log.d(TAG, "socket created");
+ if (DBG) Log.d(TAG, "socket created");
/* Add the socket into the socket map */
synchronized(NfcService.this) {
mSocketMap.put(registeredSocket.mHandle, clientSocket);
@@ -2001,12 +2001,12 @@
break;
case LLCP_CONNECTIONLESS_SOCKET_TYPE:
- Log.d(TAG, "Registered Llcp Connectionless Socket");
+ if (DBG) Log.d(TAG, "Registered Llcp Connectionless Socket");
NativeLlcpConnectionlessSocket connectionlessSocket;
connectionlessSocket = mManager.doCreateLlcpConnectionlessSocket(
registeredSocket.mSap);
if (connectionlessSocket != null) {
- Log.d(TAG, "connectionless socket created");
+ if (DBG) Log.d(TAG, "connectionless socket created");
/* Add the socket into the socket map */
synchronized(NfcService.this) {
mSocketMap.put(registeredSocket.mHandle, connectionlessSocket);
@@ -2030,7 +2030,7 @@
LlcpLinkIntent.putExtra(NfcAdapter.EXTRA_LLCP_LINK_STATE_CHANGED,
NfcAdapter.LLCP_LINK_STATE_ACTIVATED);
- Log.d(TAG, "Broadcasting LLCP activation");
+ if (DBG) Log.d(TAG, "Broadcasting LLCP activation");
mContext.sendOrderedBroadcast(LlcpLinkIntent, NFC_PERM);
}
@@ -2046,7 +2046,7 @@
public void handleMessage(Message msg) {
switch (msg.what) {
case MSG_NDEF_TAG:
- Log.d(TAG, "Tag detected, notifying applications");
+ if (DBG) Log.d(TAG, "Tag detected, notifying applications");
NativeNfcTag nativeTag = (NativeNfcTag) msg.obj;
if (nativeTag.connect()) {
if (nativeTag.checkNdef()) {
@@ -2063,8 +2063,8 @@
TagTarget.internalTypeToNdefTargets(nativeTag.getType()),
new NdefMessage[][] {msgNdef});
Intent intent = buildNdefTagIntent(tag);
- Log.d(TAG, "NDEF tag found, starting corresponding activity");
- Log.d(TAG, tag.toString());
+ if (DBG) Log.d(TAG, "NDEF tag found, starting corresponding activity");
+ if (DBG) Log.d(TAG, tag.toString());
try {
mContext.startActivity(intent);
registerTagObject(nativeTag);
@@ -2089,7 +2089,7 @@
TagTarget.internalTypeToNdefTargets(nativeTag.getType()),
new NdefMessage[][] { {} });
Intent intent = buildNdefTagIntent(tag);
- Log.d(TAG, "NDEF tag found, but length 0 or invalid format, starting corresponding activity");
+ if (DBG) Log.d(TAG, "NDEF tag found, but length 0 or invalid format, starting corresponding activity");
try {
mContext.startActivity(intent);
registerTagObject(nativeTag);
@@ -2108,8 +2108,8 @@
intent.putExtra(NfcAdapter.EXTRA_TAG, tag);
intent.putExtra(NfcAdapter.EXTRA_ID, tag.getId());
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- Log.d(TAG, "Non-NDEF tag found, starting corresponding activity");
- Log.d(TAG, tag.toString());
+ if (DBG) Log.d(TAG, "Non-NDEF tag found, starting corresponding activity");
+ if (DBG) Log.d(TAG, tag.toString());
try {
mContext.startActivity(intent);
registerTagObject(nativeTag);
@@ -2124,13 +2124,13 @@
}
break;
case MSG_CARD_EMULATION:
- Log.d(TAG, "Card Emulation message");
+ if (DBG) Log.d(TAG, "Card Emulation message");
byte[] aid = (byte[]) msg.obj;
/* Send broadcast ordered */
Intent TransactionIntent = new Intent();
TransactionIntent.setAction(NfcAdapter.ACTION_TRANSACTION_DETECTED);
TransactionIntent.putExtra(NfcAdapter.EXTRA_AID, aid);
- Log.d(TAG, "Broadcasting Card Emulation event");
+ if (DBG) Log.d(TAG, "Broadcasting Card Emulation event");
mContext.sendOrderedBroadcast(TransactionIntent, NFC_PERM);
break;
@@ -2140,13 +2140,13 @@
Log.d(TAG, "LLCP Activation message");
if (device.getMode() == NativeP2pDevice.MODE_P2P_TARGET) {
- Log.d(TAG, "NativeP2pDevice.MODE_P2P_TARGET");
+ if (DBG) Log.d(TAG, "NativeP2pDevice.MODE_P2P_TARGET");
if (device.doConnect()) {
/* Check Llcp compliancy */
if (mManager.doCheckLlcp()) {
/* Activate Llcp Link */
if (mManager.doActivateLlcp()) {
- Log.d(TAG, "Initiator Activate LLCP OK");
+ if (DBG) Log.d(TAG, "Initiator Activate LLCP OK");
activateLlcpLink();
} else {
/* should not happen */
@@ -2155,25 +2155,25 @@
}
} else {
- Log.d(TAG, "Remote Target does not support LLCP. Disconnect.");
+ if (DBG) Log.d(TAG, "Remote Target does not support LLCP. Disconnect.");
device.doDisconnect();
}
} else {
- Log.d(TAG, "Cannot connect remote Target. Restart polling loop.");
+ if (DBG) Log.d(TAG, "Cannot connect remote Target. Restart polling loop.");
/* resume should be done in doConnect */
}
} else if (device.getMode() == NativeP2pDevice.MODE_P2P_INITIATOR) {
- Log.d(TAG, "NativeP2pDevice.MODE_P2P_INITIATOR");
+ if (DBG) Log.d(TAG, "NativeP2pDevice.MODE_P2P_INITIATOR");
/* Check Llcp compliancy */
if (mManager.doCheckLlcp()) {
/* Activate Llcp Link */
if (mManager.doActivateLlcp()) {
- Log.d(TAG, "Target Activate LLCP OK");
+ if (DBG) Log.d(TAG, "Target Activate LLCP OK");
activateLlcpLink();
}
} else {
- Log.d(TAG, "checkLlcp failed");
+ Log.w(TAG, "checkLlcp failed");
}
}
break;
@@ -2183,11 +2183,11 @@
Log.d(TAG, "LLCP Link Deactivated message. Restart polling loop.");
if (device.getMode() == NativeP2pDevice.MODE_P2P_TARGET) {
- Log.d(TAG, "disconnecting from target");
+ if (DBG) Log.d(TAG, "disconnecting from target");
/* Restart polling loop */
device.doDisconnect();
} else {
- Log.d(TAG, "not disconnecting from initiator");
+ if (DBG) Log.d(TAG, "not disconnecting from initiator");
}
/* Mark the link state */
@@ -2198,16 +2198,16 @@
LlcpLinkIntent.setAction(NfcAdapter.ACTION_LLCP_LINK_STATE_CHANGED);
LlcpLinkIntent.putExtra(NfcAdapter.EXTRA_LLCP_LINK_STATE_CHANGED,
NfcAdapter.LLCP_LINK_STATE_DEACTIVATED);
- Log.d(TAG, "Broadcasting LLCP deactivation");
+ if (DBG) Log.d(TAG, "Broadcasting LLCP deactivation");
mContext.sendOrderedBroadcast(LlcpLinkIntent, NFC_PERM);
break;
case MSG_TARGET_DESELECTED:
/* Broadcast Intent Target Deselected */
- Log.d(TAG, "Target Deselected");
+ if (DBG) Log.d(TAG, "Target Deselected");
Intent TargetDeselectedIntent = new Intent();
TargetDeselectedIntent.setAction(mManager.INTERNAL_TARGET_DESELECTED_ACTION);
- Log.d(TAG, "Broadcasting Intent");
+ if (DBG) Log.d(TAG, "Broadcasting Intent");
mContext.sendOrderedBroadcast(TargetDeselectedIntent, NFC_PERM);
break;
@@ -2253,7 +2253,7 @@
public void onReceive(Context context, Intent intent) {
if (intent.getAction().equals(
NativeNfcManager.INTERNAL_TARGET_DESELECTED_ACTION)) {
- Log.d(TAG, "INERNAL_TARGET_DESELECTED_ACTION");
+ if (DBG) Log.d(TAG, "INERNAL_TARGET_DESELECTED_ACTION");
/* Restart polling loop for notification */
maybeEnableDiscovery();
