Merge "Set hiddenSSID flag to connect to Wi-Fi AP even in stealth mode"
diff --git a/nci/jni/CondVar.cpp b/nci/jni/CondVar.cpp
index 29372c3..4b939a2 100644
--- a/nci/jni/CondVar.cpp
+++ b/nci/jni/CondVar.cpp
@@ -44,7 +44,7 @@
int const res = pthread_cond_init (&mCondition, &attr);
if (res)
{
- ALOGE ("CondVar::CondVar: fail init; error=0x%X", res);
+ ALOGE("CondVar::CondVar: fail init; error=0x%X", res);
}
}
@@ -63,7 +63,7 @@
int const res = pthread_cond_destroy (&mCondition);
if (res)
{
- ALOGE ("CondVar::~CondVar: fail destroy; error=0x%X", res);
+ ALOGE("CondVar::~CondVar: fail destroy; error=0x%X", res);
}
}
@@ -82,7 +82,7 @@
int const res = pthread_cond_wait (&mCondition, mutex.nativeHandle());
if (res)
{
- ALOGE ("CondVar::wait: fail wait; error=0x%X", res);
+ ALOGE("CondVar::wait: fail wait; error=0x%X", res);
}
}
@@ -104,7 +104,7 @@
if (clock_gettime (CLOCK_MONOTONIC, &absoluteTime) == -1)
{
- ALOGE ("CondVar::wait: fail get time; errno=0x%X", errno);
+ ALOGE("CondVar::wait: fail get time; errno=0x%X", errno);
}
else
{
@@ -121,7 +121,7 @@
int waitResult = pthread_cond_timedwait (&mCondition, mutex.nativeHandle(), &absoluteTime);
if ((waitResult != 0) && (waitResult != ETIMEDOUT))
- ALOGE ("CondVar::wait: fail timed wait; error=0x%X", waitResult);
+ ALOGE("CondVar::wait: fail timed wait; error=0x%X", waitResult);
retVal = (waitResult == 0); //waited successfully
return retVal;
}
@@ -141,7 +141,7 @@
int const res = pthread_cond_signal (&mCondition);
if (res)
{
- ALOGE ("CondVar::notifyOne: fail signal; error=0x%X", res);
+ ALOGE("CondVar::notifyOne: fail signal; error=0x%X", res);
}
}
diff --git a/nci/jni/DataQueue.cpp b/nci/jni/DataQueue.cpp
index 1b7193e..2d7e40f 100644
--- a/nci/jni/DataQueue.cpp
+++ b/nci/jni/DataQueue.cpp
@@ -103,7 +103,7 @@
}
else
{
- ALOGE ("DataQueue::enqueue: out of memory ?????");
+ ALOGE("DataQueue::enqueue: out of memory ?????");
}
mMutex.unlock ();
return retval;
diff --git a/nci/jni/Mutex.cpp b/nci/jni/Mutex.cpp
index 22c1f00..624e9bc 100644
--- a/nci/jni/Mutex.cpp
+++ b/nci/jni/Mutex.cpp
@@ -41,7 +41,7 @@
int res = pthread_mutex_init (&mMutex, NULL);
if (res != 0)
{
- ALOGE ("Mutex::Mutex: fail init; error=0x%X", res);
+ ALOGE("Mutex::Mutex: fail init; error=0x%X", res);
}
}
@@ -60,7 +60,7 @@
int res = pthread_mutex_destroy (&mMutex);
if (res != 0)
{
- ALOGE ("Mutex::~Mutex: fail destroy; error=0x%X", res);
+ ALOGE("Mutex::~Mutex: fail destroy; error=0x%X", res);
}
}
@@ -79,7 +79,7 @@
int res = pthread_mutex_lock (&mMutex);
if (res != 0)
{
- ALOGE ("Mutex::lock: fail lock; error=0x%X", res);
+ ALOGE("Mutex::lock: fail lock; error=0x%X", res);
}
}
@@ -98,7 +98,7 @@
int res = pthread_mutex_unlock (&mMutex);
if (res != 0)
{
- ALOGE ("Mutex::unlock: fail unlock; error=0x%X", res);
+ ALOGE("Mutex::unlock: fail unlock; error=0x%X", res);
}
}
@@ -117,7 +117,7 @@
int res = pthread_mutex_trylock (&mMutex);
if ((res != 0) && (res != EBUSY))
{
- ALOGE ("Mutex::tryLock: error=0x%X", res);
+ ALOGE("Mutex::tryLock: error=0x%X", res);
}
return res == 0;
}
diff --git a/nci/jni/NativeLlcpConnectionlessSocket.cpp b/nci/jni/NativeLlcpConnectionlessSocket.cpp
index 04bc005..33006c4 100644
--- a/nci/jni/NativeLlcpConnectionlessSocket.cpp
+++ b/nci/jni/NativeLlcpConnectionlessSocket.cpp
@@ -61,7 +61,7 @@
*******************************************************************************/
static jboolean nativeLlcpConnectionlessSocket_doSendTo (JNIEnv *e, jobject o, jint nsap, jbyteArray data)
{
- ALOGD ("%s: nsap = %d", __func__, nsap);
+ ALOGV("%s: nsap = %d", __func__, nsap);
ScopedLocalRef<jclass> c(e, e->GetObjectClass(o));
jfieldID f = e->GetFieldID(c.get(), "mHandle", "I");
@@ -74,11 +74,11 @@
}
size_t byte_count = bytes.size();
- ALOGD("NFA_P2pSendUI: len = %zu", byte_count);
+ ALOGV("NFA_P2pSendUI: len = %zu", byte_count);
uint8_t* raw_ptr = const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(&bytes[0])); // TODO: API bug; NFA_P2pSendUI should take const*!
tNFA_STATUS status = NFA_P2pSendUI((tNFA_HANDLE) handle, nsap, byte_count, raw_ptr);
- ALOGD("%s: NFA_P2pSendUI done, status = %d", __func__, status);
+ ALOGV("%s: NFA_P2pSendUI done, status = %d", __func__, status);
if (status != NFA_STATUS_OK)
{
ALOGE("%s: NFA_P2pSendUI failed, status = %d", __func__, status);
@@ -102,7 +102,7 @@
*******************************************************************************/
void nativeLlcpConnectionlessSocket_receiveData (uint8_t* data, uint32_t len, uint32_t remoteSap)
{
- ALOGD ("%s: waiting for data = %d, len = %d", __func__, sConnlessRecvWaitingForData, len);
+ ALOGV("%s: waiting for data = %d, len = %d", __func__, sConnlessRecvWaitingForData, len);
// Sanity...
if (sConnlessRecvLen < len)
@@ -173,20 +173,20 @@
*******************************************************************************/
static jobject nativeLlcpConnectionlessSocket_doReceiveFrom (JNIEnv* e, jobject, jint linkMiu)
{
- ALOGD ("%s: linkMiu = %d", __func__, linkMiu);
+ ALOGV("%s: linkMiu = %d", __func__, linkMiu);
jobject llcpPacket = NULL;
ScopedLocalRef<jclass> clsLlcpPacket(e, NULL);
if (sConnlessRecvWaitingForData != JNI_FALSE)
{
- ALOGD ("%s: Already waiting for incoming data", __func__);
+ ALOGV("%s: Already waiting for incoming data", __func__);
return NULL;
}
sConnlessRecvBuf = (uint8_t*) malloc (linkMiu);
if (sConnlessRecvBuf == NULL)
{
- ALOGD ("%s: Failed to allocate %d bytes memory buffer", __func__, linkMiu);
+ ALOGV("%s: Failed to allocate %d bytes memory buffer", __func__, linkMiu);
return NULL;
}
sConnlessRecvLen = linkMiu;
@@ -194,7 +194,7 @@
// Create the write semaphore
if (sem_init (&sConnlessRecvSem, 0, 0) == -1)
{
- ALOGE ("%s: semaphore creation failed (errno=0x%08x)", __func__, errno);
+ ALOGE("%s: semaphore creation failed (errno=0x%08x)", __func__, errno);
return connectionlessCleanup ();
}
@@ -203,14 +203,14 @@
// Wait for sConnlessRecvSem completion status
if (sem_wait (&sConnlessRecvSem))
{
- ALOGE ("%s: Failed to wait for write semaphore (errno=0x%08x)", __func__, errno);
+ ALOGE("%s: Failed to wait for write semaphore (errno=0x%08x)", __func__, errno);
goto TheEnd;
}
// Create new LlcpPacket object
if (nfc_jni_cache_object_local (e, "com/android/nfc/LlcpPacket", &(llcpPacket)) == -1)
{
- ALOGE ("%s: Find LlcpPacket class error", __func__);
+ ALOGE("%s: Find LlcpPacket class error", __func__);
return connectionlessCleanup ();
}
@@ -219,7 +219,7 @@
if (e->ExceptionCheck())
{
e->ExceptionClear();
- ALOGE ("%s: Get Object class error", __func__);
+ ALOGE("%s: Get Object class error", __func__);
return connectionlessCleanup ();
}
@@ -229,7 +229,7 @@
e->SetIntField(llcpPacket, f, (jbyte) sConnlessRecvRemoteSap);
// Set Llcp Packet Buffer
- ALOGD ("%s: Received Llcp packet buffer size = %d\n", __func__, sConnlessRecvLen);
+ ALOGV("%s: Received Llcp packet buffer size = %d\n", __func__, sConnlessRecvLen);
f = e->GetFieldID(clsLlcpPacket.get(), "mDataBuffer", "[B");
{
@@ -242,7 +242,7 @@
connectionlessCleanup ();
if (sem_destroy (&sConnlessRecvSem))
{
- ALOGE ("%s: Failed to destroy sConnlessRecvSem semaphore (errno=0x%08x)", __func__, errno);
+ ALOGE("%s: Failed to destroy sConnlessRecvSem semaphore (errno=0x%08x)", __func__, errno);
}
return llcpPacket;
}
@@ -261,7 +261,7 @@
*******************************************************************************/
static jboolean nativeLlcpConnectionlessSocket_doClose (JNIEnv *e, jobject o)
{
- ALOGD ("%s", __func__);
+ ALOGV("%s", __func__);
ScopedLocalRef<jclass> c(e, e->GetObjectClass(o));
jfieldID f = e->GetFieldID(c.get(), "mHandle", "I");
@@ -270,7 +270,7 @@
tNFA_STATUS status = NFA_P2pDisconnect((tNFA_HANDLE) handle, FALSE);
if (status != NFA_STATUS_OK)
{
- ALOGE ("%s: disconnect failed, status = %d", __func__, status);
+ ALOGE("%s: disconnect failed, status = %d", __func__, status);
return JNI_FALSE;
}
return JNI_TRUE;
diff --git a/nci/jni/NativeLlcpServiceSocket.cpp b/nci/jni/NativeLlcpServiceSocket.cpp
index 8456013..5d59569 100644
--- a/nci/jni/NativeLlcpServiceSocket.cpp
+++ b/nci/jni/NativeLlcpServiceSocket.cpp
@@ -56,7 +56,7 @@
bool stat = false;
PeerToPeer::tJNI_HANDLE connHandle = PeerToPeer::getInstance().getNewJniHandle ();
- ALOGD ("%s: enter", __func__);
+ ALOGV("%s: enter", __func__);
serverHandle = (PeerToPeer::tJNI_HANDLE) nfc_jni_get_nfc_socket_handle (e, o);
@@ -64,14 +64,14 @@
if (! stat)
{
- ALOGE ("%s: fail accept", __func__);
+ ALOGE("%s: fail accept", __func__);
goto TheEnd;
}
/* Create new LlcpSocket object */
if (nfc_jni_cache_object_local(e, gNativeLlcpSocketClassName, &(clientSocket)) == -1)
{
- ALOGE ("%s: fail create NativeLlcpSocket", __func__);
+ ALOGE("%s: fail create NativeLlcpSocket", __func__);
goto TheEnd;
}
@@ -80,7 +80,7 @@
if (e->ExceptionCheck())
{
e->ExceptionClear();
- ALOGE ("%s: get class object error", __func__);
+ ALOGE("%s: get class object error", __func__);
goto TheEnd;
}
@@ -97,7 +97,7 @@
e->SetIntField (clientSocket, f, (jint)rw);
TheEnd:
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
return clientSocket;
}
@@ -115,7 +115,7 @@
*******************************************************************************/
static jboolean nativeLlcpServiceSocket_doClose(JNIEnv *e, jobject o)
{
- ALOGD ("%s: enter", __func__);
+ ALOGV("%s: enter", __func__);
PeerToPeer::tJNI_HANDLE jniServerHandle = 0;
bool stat = false;
@@ -123,7 +123,7 @@
stat = PeerToPeer::getInstance().deregisterServer (jniServerHandle);
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
return JNI_TRUE;
}
diff --git a/nci/jni/NativeLlcpSocket.cpp b/nci/jni/NativeLlcpSocket.cpp
index 2eeca7c..d6bfdcd 100644
--- a/nci/jni/NativeLlcpSocket.cpp
+++ b/nci/jni/NativeLlcpSocket.cpp
@@ -38,12 +38,12 @@
*******************************************************************************/
static jboolean nativeLlcpSocket_doConnect (JNIEnv* e, jobject o, jint nSap)
{
- ALOGD ("%s: enter; sap=%d", __func__, nSap);
+ ALOGV("%s: enter; sap=%d", __func__, nSap);
PeerToPeer::tJNI_HANDLE jniHandle = (PeerToPeer::tJNI_HANDLE) nfc_jni_get_nfc_socket_handle(e, o);
bool stat = PeerToPeer::getInstance().connectConnOriented (jniHandle, nSap);
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
return stat ? JNI_TRUE : JNI_FALSE;
}
@@ -62,7 +62,7 @@
*******************************************************************************/
static jboolean nativeLlcpSocket_doConnectBy (JNIEnv* e, jobject o, jstring sn)
{
- ALOGD ("%s: enter", __func__);
+ ALOGV("%s: enter", __func__);
PeerToPeer::tJNI_HANDLE jniHandle = (PeerToPeer::tJNI_HANDLE) nfc_jni_get_nfc_socket_handle(e, o);
@@ -73,7 +73,7 @@
}
bool stat = PeerToPeer::getInstance().connectConnOriented(jniHandle, serviceName.c_str());
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
return stat ? JNI_TRUE : JNI_FALSE;
}
@@ -91,12 +91,12 @@
*******************************************************************************/
static jboolean nativeLlcpSocket_doClose(JNIEnv *e, jobject o)
{
- ALOGD ("%s: enter", __func__);
+ ALOGV("%s: enter", __func__);
PeerToPeer::tJNI_HANDLE jniHandle = (PeerToPeer::tJNI_HANDLE) nfc_jni_get_nfc_socket_handle(e, o);
bool stat = PeerToPeer::getInstance().disconnectConnOriented (jniHandle);
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
return stat ? JNI_TRUE : JNI_FALSE;
}
@@ -115,7 +115,7 @@
*******************************************************************************/
static jboolean nativeLlcpSocket_doSend (JNIEnv* e, jobject o, jbyteArray data)
{
- ALOGD_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: enter", __func__);
+ ALOGV_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: enter", __func__);
ScopedByteArrayRO bytes(e, data);
@@ -123,7 +123,7 @@
uint8_t* raw_ptr = const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(&bytes[0])); // TODO: API bug: send should take const*!
bool stat = PeerToPeer::getInstance().send(jniHandle, raw_ptr, bytes.size());
- ALOGD_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: exit", __func__);
+ ALOGV_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: exit", __func__);
return stat ? JNI_TRUE : JNI_FALSE;
}
@@ -142,7 +142,7 @@
*******************************************************************************/
static jint nativeLlcpSocket_doReceive(JNIEnv *e, jobject o, jbyteArray origBuffer)
{
- ALOGD_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: enter", __func__);
+ ALOGV_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: enter", __func__);
ScopedByteArrayRW bytes(e, origBuffer);
@@ -158,7 +158,7 @@
else
retval = -1;
- ALOGD_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: exit; actual len=%d", __func__, retval);
+ ALOGV_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: exit; actual len=%d", __func__, retval);
return retval;
}
@@ -176,12 +176,12 @@
*******************************************************************************/
static jint nativeLlcpSocket_doGetRemoteSocketMIU (JNIEnv* e, jobject o)
{
- ALOGD ("%s: enter", __func__);
+ ALOGV("%s: enter", __func__);
PeerToPeer::tJNI_HANDLE jniHandle = (PeerToPeer::tJNI_HANDLE) nfc_jni_get_nfc_socket_handle(e, o);
jint miu = PeerToPeer::getInstance().getRemoteMaxInfoUnit(jniHandle);
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
return miu;
}
@@ -199,12 +199,12 @@
*******************************************************************************/
static jint nativeLlcpSocket_doGetRemoteSocketRW (JNIEnv* e, jobject o)
{
- ALOGD ("%s: enter", __func__);
+ ALOGV("%s: enter", __func__);
PeerToPeer::tJNI_HANDLE jniHandle = (PeerToPeer::tJNI_HANDLE) nfc_jni_get_nfc_socket_handle(e, o);
jint rw = PeerToPeer::getInstance().getRemoteRecvWindow (jniHandle);
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
return rw;
}
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp
index 01a9f27..146b61e 100755
--- a/nci/jni/NativeNfcManager.cpp
+++ b/nci/jni/NativeNfcManager.cpp
@@ -219,13 +219,13 @@
static void nfaConnectionCallback (uint8_t connEvent, tNFA_CONN_EVT_DATA* eventData)
{
tNFA_STATUS status = NFA_STATUS_FAILED;
- ALOGD("%s: event= %u", __func__, connEvent);
+ ALOGV("%s: event= %u", __func__, connEvent);
switch (connEvent)
{
case NFA_POLL_ENABLED_EVT: // whether polling successfully started
{
- ALOGD("%s: NFA_POLL_ENABLED_EVT: status = %u", __func__, eventData->status);
+ ALOGV("%s: NFA_POLL_ENABLED_EVT: status = %u", __func__, eventData->status);
SyncEventGuard guard (sNfaEnableDisablePollingEvent);
sNfaEnableDisablePollingEvent.notifyOne ();
@@ -234,7 +234,7 @@
case NFA_POLL_DISABLED_EVT: // Listening/Polling stopped
{
- ALOGD("%s: NFA_POLL_DISABLED_EVT: status = %u", __func__, eventData->status);
+ ALOGV("%s: NFA_POLL_DISABLED_EVT: status = %u", __func__, eventData->status);
SyncEventGuard guard (sNfaEnableDisablePollingEvent);
sNfaEnableDisablePollingEvent.notifyOne ();
@@ -243,7 +243,7 @@
case NFA_RF_DISCOVERY_STARTED_EVT: // RF Discovery started
{
- ALOGD("%s: NFA_RF_DISCOVERY_STARTED_EVT: status = %u", __func__, eventData->status);
+ ALOGV("%s: NFA_RF_DISCOVERY_STARTED_EVT: status = %u", __func__, eventData->status);
SyncEventGuard guard (sNfaEnableDisablePollingEvent);
sNfaEnableDisablePollingEvent.notifyOne ();
@@ -252,7 +252,7 @@
case NFA_RF_DISCOVERY_STOPPED_EVT: // RF Discovery stopped event
{
- ALOGD("%s: NFA_RF_DISCOVERY_STOPPED_EVT: status = %u", __func__, eventData->status);
+ ALOGV("%s: NFA_RF_DISCOVERY_STOPPED_EVT: status = %u", __func__, eventData->status);
SyncEventGuard guard (sNfaEnableDisablePollingEvent);
sNfaEnableDisablePollingEvent.notifyOne ();
@@ -261,7 +261,7 @@
case NFA_DISC_RESULT_EVT: // NFC link/protocol discovery notificaiton
status = eventData->disc_result.status;
- ALOGD("%s: NFA_DISC_RESULT_EVT: status = %d", __func__, status);
+ ALOGV("%s: NFA_DISC_RESULT_EVT: status = %d", __func__, status);
if (status != NFA_STATUS_OK)
{
ALOGE("%s: NFA_DISC_RESULT_EVT error: status = %d", __func__, status);
@@ -274,7 +274,7 @@
break;
case NFA_SELECT_RESULT_EVT: // NFC link/protocol discovery select response
- ALOGD("%s: NFA_SELECT_RESULT_EVT: status = %d, gIsSelectingRfInterface = %d, sIsDisabling=%d", __func__, eventData->status, gIsSelectingRfInterface, sIsDisabling);
+ ALOGV("%s: NFA_SELECT_RESULT_EVT: status = %d, gIsSelectingRfInterface = %d, sIsDisabling=%d", __func__, eventData->status, gIsSelectingRfInterface, sIsDisabling);
if (sIsDisabling)
break;
@@ -292,11 +292,11 @@
break;
case NFA_DEACTIVATE_FAIL_EVT:
- ALOGD("%s: NFA_DEACTIVATE_FAIL_EVT: status = %d", __func__, eventData->status);
+ ALOGV("%s: NFA_DEACTIVATE_FAIL_EVT: status = %d", __func__, eventData->status);
break;
case NFA_ACTIVATED_EVT: // NFC link/protocol activated
- ALOGD("%s: NFA_ACTIVATED_EVT: gIsSelectingRfInterface=%d, sIsDisabling=%d", __func__, gIsSelectingRfInterface, sIsDisabling);
+ ALOGV("%s: NFA_ACTIVATED_EVT: gIsSelectingRfInterface=%d, sIsDisabling=%d", __func__, gIsSelectingRfInterface, sIsDisabling);
if((eventData->activated.activate_ntf.protocol != NFA_PROTOCOL_NFC_DEP) && (!isListenMode (eventData->activated)))
{
nativeNfcTag_setRfInterface ((tNFA_INTF_TYPE) eventData->activated.activate_ntf.intf_param.type);
@@ -324,21 +324,21 @@
{
if (sReaderModeEnabled)
{
- ALOGD("%s: ignoring peer target in reader mode.", __func__);
+ ALOGV("%s: ignoring peer target in reader mode.", __func__);
NFA_Deactivate (FALSE);
break;
}
sP2pActive = true;
- ALOGD("%s: NFA_ACTIVATED_EVT; is p2p", __func__);
+ ALOGV("%s: NFA_ACTIVATED_EVT; is p2p", __func__);
// Disable RF field events in case of p2p
uint8_t nfa_disable_rf_events[] = { 0x00 };
- ALOGD ("%s: Disabling RF field events", __func__);
+ ALOGV("%s: Disabling RF field events", __func__);
status = NFA_SetConfig(NCI_PARAM_ID_RF_FIELD_INFO, sizeof(nfa_disable_rf_events),
&nfa_disable_rf_events[0]);
if (status == NFA_STATUS_OK) {
- ALOGD ("%s: Disabled RF field events", __func__);
+ ALOGV("%s: Disabled RF field events", __func__);
} else {
- ALOGE ("%s: Failed to disable RF field events", __func__);
+ ALOGE("%s: Failed to disable RF field events", __func__);
}
}
else if (pn544InteropIsBusy() == false)
@@ -356,7 +356,7 @@
break;
case NFA_DEACTIVATED_EVT: // NFC link/protocol deactivated
- ALOGD("%s: NFA_DEACTIVATED_EVT Type: %u, gIsTagDeactivating: %d", __func__, eventData->deactivated.type,gIsTagDeactivating);
+ ALOGV("%s: NFA_DEACTIVATED_EVT Type: %u, gIsTagDeactivating: %d", __func__, eventData->deactivated.type,gIsTagDeactivating);
NfcTag::getInstance().setDeactivationState (eventData->deactivated);
if (eventData->deactivated.type != NFA_DEACTIVATE_TYPE_SLEEP)
{
@@ -391,19 +391,19 @@
} else if (sP2pActive) {
sP2pActive = false;
// Make sure RF field events are re-enabled
- ALOGD("%s: NFA_DEACTIVATED_EVT; is p2p", __func__);
+ ALOGV("%s: NFA_DEACTIVATED_EVT; is p2p", __func__);
// Disable RF field events in case of p2p
uint8_t nfa_enable_rf_events[] = { 0x01 };
if (!sIsDisabling && sIsNfaEnabled)
{
- ALOGD ("%s: Enabling RF field events", __func__);
+ ALOGV("%s: Enabling RF field events", __func__);
status = NFA_SetConfig(NCI_PARAM_ID_RF_FIELD_INFO, sizeof(nfa_enable_rf_events),
&nfa_enable_rf_events[0]);
if (status == NFA_STATUS_OK) {
- ALOGD ("%s: Enabled RF field events", __func__);
+ ALOGV("%s: Enabled RF field events", __func__);
} else {
- ALOGE ("%s: Failed to enable RF field events", __func__);
+ ALOGE("%s: Failed to enable RF field events", __func__);
}
}
}
@@ -413,7 +413,7 @@
case NFA_TLV_DETECT_EVT: // TLV Detection complete
status = eventData->tlv_detect.status;
- ALOGD("%s: NFA_TLV_DETECT_EVT: status = %d, protocol = %d, num_tlvs = %d, num_bytes = %d",
+ ALOGV("%s: NFA_TLV_DETECT_EVT: status = %d, protocol = %d, num_tlvs = %d, num_bytes = %d",
__func__, status, eventData->tlv_detect.protocol,
eventData->tlv_detect.num_tlvs, eventData->tlv_detect.num_bytes);
if (status != NFA_STATUS_OK)
@@ -426,7 +426,7 @@
//if status is failure, it means the tag does not contain any or valid NDEF data;
//pass the failure status to the NFC Service;
status = eventData->ndef_detect.status;
- ALOGD("%s: NFA_NDEF_DETECT_EVT: status = 0x%X, protocol = %u, "
+ ALOGV("%s: NFA_NDEF_DETECT_EVT: status = 0x%X, protocol = %u, "
"max_size = %u, cur_size = %u, flags = 0x%X", __func__,
status,
eventData->ndef_detect.protocol, eventData->ndef_detect.max_size,
@@ -438,17 +438,17 @@
break;
case NFA_DATA_EVT: // Data message received (for non-NDEF reads)
- ALOGD("%s: NFA_DATA_EVT: status = 0x%X, len = %d", __func__, eventData->status, eventData->data.len);
+ ALOGV("%s: NFA_DATA_EVT: status = 0x%X, len = %d", __func__, eventData->status, eventData->data.len);
nativeNfcTag_doTransceiveStatus(eventData->status, eventData->data.p_data, eventData->data.len);
break;
case NFA_RW_INTF_ERROR_EVT:
- ALOGD("%s: NFC_RW_INTF_ERROR_EVT", __func__);
+ ALOGV("%s: NFC_RW_INTF_ERROR_EVT", __func__);
nativeNfcTag_notifyRfTimeout();
nativeNfcTag_doReadCompleted (NFA_STATUS_TIMEOUT);
break;
case NFA_SELECT_CPLT_EVT: // Select completed
status = eventData->status;
- ALOGD("%s: NFA_SELECT_CPLT_EVT: status = %d", __func__, status);
+ ALOGV("%s: NFA_SELECT_CPLT_EVT: status = %d", __func__, status);
if (status != NFA_STATUS_OK)
{
ALOGE("%s: NFA_SELECT_CPLT_EVT error: status = %d", __func__, status);
@@ -456,34 +456,34 @@
break;
case NFA_READ_CPLT_EVT: // NDEF-read or tag-specific-read completed
- ALOGD("%s: NFA_READ_CPLT_EVT: status = 0x%X", __func__, eventData->status);
+ ALOGV("%s: NFA_READ_CPLT_EVT: status = 0x%X", __func__, eventData->status);
nativeNfcTag_doReadCompleted (eventData->status);
NfcTag::getInstance().connectionEventHandler (connEvent, eventData);
break;
case NFA_WRITE_CPLT_EVT: // Write completed
- ALOGD("%s: NFA_WRITE_CPLT_EVT: status = %d", __func__, eventData->status);
+ ALOGV("%s: NFA_WRITE_CPLT_EVT: status = %d", __func__, eventData->status);
nativeNfcTag_doWriteStatus (eventData->status == NFA_STATUS_OK);
break;
case NFA_SET_TAG_RO_EVT: // Tag set as Read only
- ALOGD("%s: NFA_SET_TAG_RO_EVT: status = %d", __func__, eventData->status);
+ ALOGV("%s: NFA_SET_TAG_RO_EVT: status = %d", __func__, eventData->status);
nativeNfcTag_doMakeReadonlyResult(eventData->status);
break;
case NFA_CE_NDEF_WRITE_START_EVT: // NDEF write started
- ALOGD("%s: NFA_CE_NDEF_WRITE_START_EVT: status: %d", __func__, eventData->status);
+ ALOGV("%s: NFA_CE_NDEF_WRITE_START_EVT: status: %d", __func__, eventData->status);
if (eventData->status != NFA_STATUS_OK)
ALOGE("%s: NFA_CE_NDEF_WRITE_START_EVT error: status = %d", __func__, eventData->status);
break;
case NFA_CE_NDEF_WRITE_CPLT_EVT: // NDEF write completed
- ALOGD("%s: FA_CE_NDEF_WRITE_CPLT_EVT: len = %u", __func__, eventData->ndef_write_cplt.len);
+ ALOGV("%s: FA_CE_NDEF_WRITE_CPLT_EVT: len = %u", __func__, eventData->ndef_write_cplt.len);
break;
case NFA_LLCP_ACTIVATED_EVT: // LLCP link is activated
- ALOGD("%s: NFA_LLCP_ACTIVATED_EVT: is_initiator: %d remote_wks: %d, remote_lsc: %d, remote_link_miu: %d, local_link_miu: %d",
+ ALOGV("%s: NFA_LLCP_ACTIVATED_EVT: is_initiator: %d remote_wks: %d, remote_lsc: %d, remote_link_miu: %d, local_link_miu: %d",
__func__,
eventData->llcp_activated.is_initiator,
eventData->llcp_activated.remote_wks,
@@ -495,37 +495,37 @@
break;
case NFA_LLCP_DEACTIVATED_EVT: // LLCP link is deactivated
- ALOGD("%s: NFA_LLCP_DEACTIVATED_EVT", __func__);
+ ALOGV("%s: NFA_LLCP_DEACTIVATED_EVT", __func__);
PeerToPeer::getInstance().llcpDeactivatedHandler (getNative(0, 0), eventData->llcp_deactivated);
break;
case NFA_LLCP_FIRST_PACKET_RECEIVED_EVT: // Received first packet over llcp
- ALOGD("%s: NFA_LLCP_FIRST_PACKET_RECEIVED_EVT", __func__);
+ ALOGV("%s: NFA_LLCP_FIRST_PACKET_RECEIVED_EVT", __func__);
PeerToPeer::getInstance().llcpFirstPacketHandler (getNative(0, 0));
break;
case NFA_PRESENCE_CHECK_EVT:
- ALOGD("%s: NFA_PRESENCE_CHECK_EVT", __func__);
+ ALOGV("%s: NFA_PRESENCE_CHECK_EVT", __func__);
nativeNfcTag_doPresenceCheckResult (eventData->status);
break;
case NFA_FORMAT_CPLT_EVT:
- ALOGD("%s: NFA_FORMAT_CPLT_EVT: status=0x%X", __func__, eventData->status);
+ ALOGV("%s: NFA_FORMAT_CPLT_EVT: status=0x%X", __func__, eventData->status);
nativeNfcTag_formatStatus (eventData->status == NFA_STATUS_OK);
break;
case NFA_I93_CMD_CPLT_EVT:
- ALOGD("%s: NFA_I93_CMD_CPLT_EVT: status=0x%X", __func__, eventData->status);
+ ALOGV("%s: NFA_I93_CMD_CPLT_EVT: status=0x%X", __func__, eventData->status);
break;
case NFA_CE_UICC_LISTEN_CONFIGURED_EVT :
- ALOGD("%s: NFA_CE_UICC_LISTEN_CONFIGURED_EVT : status=0x%X", __func__, eventData->status);
+ ALOGV("%s: NFA_CE_UICC_LISTEN_CONFIGURED_EVT : status=0x%X", __func__, eventData->status);
break;
case NFA_SET_P2P_LISTEN_TECH_EVT:
- ALOGD("%s: NFA_SET_P2P_LISTEN_TECH_EVT", __func__);
+ ALOGV("%s: NFA_SET_P2P_LISTEN_TECH_EVT", __func__);
PeerToPeer::getInstance().connectionEventHandler (connEvent, eventData);
break;
default:
- ALOGE("%s: unknown event ????", __func__);
+ ALOGV("%s: unknown event ????", __func__);
break;
}
}
@@ -544,12 +544,12 @@
*******************************************************************************/
static jboolean nfcManager_initNativeStruc (JNIEnv* e, jobject o)
{
- ALOGD ("%s: enter", __func__);
+ ALOGV("%s: enter", __func__);
nfc_jni_native_data* nat = (nfc_jni_native_data*)malloc(sizeof(struct nfc_jni_native_data));
if (nat == NULL)
{
- ALOGE ("%s: fail allocate native data", __func__);
+ ALOGE("%s: fail allocate native data", __func__);
return JNI_FALSE;
}
@@ -588,17 +588,17 @@
if (nfc_jni_cache_object(e, gNativeNfcTagClassName, &(nat->cached_NfcTag)) == -1)
{
- ALOGE ("%s: fail cache NativeNfcTag", __func__);
+ ALOGE("%s: fail cache NativeNfcTag", __func__);
return JNI_FALSE;
}
if (nfc_jni_cache_object(e, gNativeP2pDeviceClassName, &(nat->cached_P2pDevice)) == -1)
{
- ALOGE ("%s: fail cache NativeP2pDevice", __func__);
+ ALOGE("%s: fail cache NativeP2pDevice", __func__);
return JNI_FALSE;
}
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
return JNI_TRUE;
}
@@ -616,14 +616,14 @@
*******************************************************************************/
void nfaDeviceManagementCallback (uint8_t dmEvent, tNFA_DM_CBACK_DATA* eventData)
{
- ALOGD ("%s: enter; event=0x%X", __func__, dmEvent);
+ ALOGV("%s: enter; event=0x%X", __func__, dmEvent);
switch (dmEvent)
{
case NFA_DM_ENABLE_EVT: /* Result of NFA_Enable */
{
SyncEventGuard guard (sNfaEnableEvent);
- ALOGD ("%s: NFA_DM_ENABLE_EVT; status=0x%X",
+ ALOGV("%s: NFA_DM_ENABLE_EVT; status=0x%X",
__func__, eventData->status);
sIsNfaEnabled = eventData->status == NFA_STATUS_OK;
sIsDisabling = false;
@@ -634,7 +634,7 @@
case NFA_DM_DISABLE_EVT: /* Result of NFA_Disable */
{
SyncEventGuard guard (sNfaDisableEvent);
- ALOGD ("%s: NFA_DM_DISABLE_EVT", __func__);
+ ALOGV("%s: NFA_DM_DISABLE_EVT", __func__);
sIsNfaEnabled = false;
sIsDisabling = false;
sNfaDisableEvent.notifyOne ();
@@ -642,7 +642,7 @@
break;
case NFA_DM_SET_CONFIG_EVT: //result of NFA_SetConfig
- ALOGD ("%s: NFA_DM_SET_CONFIG_EVT", __func__);
+ ALOGV("%s: NFA_DM_SET_CONFIG_EVT", __func__);
{
SyncEventGuard guard (sNfaSetConfigEvent);
sNfaSetConfigEvent.notifyOne();
@@ -650,7 +650,7 @@
break;
case NFA_DM_GET_CONFIG_EVT: /* Result of NFA_GetConfig */
- ALOGD ("%s: NFA_DM_GET_CONFIG_EVT", __func__);
+ ALOGV("%s: NFA_DM_GET_CONFIG_EVT", __func__);
{
SyncEventGuard guard (sNfaGetConfigEvent);
if (eventData->status == NFA_STATUS_OK &&
@@ -669,7 +669,7 @@
break;
case NFA_DM_RF_FIELD_EVT:
- ALOGD ("%s: NFA_DM_RF_FIELD_EVT; status=0x%X; field status=%u", __func__,
+ ALOGV("%s: NFA_DM_RF_FIELD_EVT; status=0x%X; field status=%u", __func__,
eventData->rf_field.status, eventData->rf_field.rf_field_status);
if (!sP2pActive && eventData->rf_field.status == NFA_STATUS_OK)
{
@@ -678,7 +678,7 @@
ScopedAttach attach(nat->vm, &e);
if (e == NULL)
{
- ALOGE ("jni env is null");
+ ALOGE("jni env is null");
return;
}
if (eventData->rf_field.rf_field_status == NFA_DM_RF_FIELD_ON)
@@ -692,26 +692,26 @@
case NFA_DM_NFCC_TIMEOUT_EVT:
{
if (dmEvent == NFA_DM_NFCC_TIMEOUT_EVT)
- ALOGE ("%s: NFA_DM_NFCC_TIMEOUT_EVT; abort", __func__);
+ ALOGE("%s: NFA_DM_NFCC_TIMEOUT_EVT; abort", __func__);
else if (dmEvent == NFA_DM_NFCC_TRANSPORT_ERR_EVT)
- ALOGE ("%s: NFA_DM_NFCC_TRANSPORT_ERR_EVT; abort", __func__);
+ ALOGE("%s: NFA_DM_NFCC_TRANSPORT_ERR_EVT; abort", __func__);
nativeNfcTag_abortWaits();
NfcTag::getInstance().abort ();
sAbortConnlessWait = true;
nativeLlcpConnectionlessSocket_abortWait();
{
- ALOGD ("%s: aborting sNfaEnableDisablePollingEvent", __func__);
+ ALOGV("%s: aborting sNfaEnableDisablePollingEvent", __func__);
SyncEventGuard guard (sNfaEnableDisablePollingEvent);
sNfaEnableDisablePollingEvent.notifyOne();
}
{
- ALOGD ("%s: aborting sNfaEnableEvent", __func__);
+ ALOGV("%s: aborting sNfaEnableEvent", __func__);
SyncEventGuard guard (sNfaEnableEvent);
sNfaEnableEvent.notifyOne();
}
{
- ALOGD ("%s: aborting sNfaDisableEvent", __func__);
+ ALOGV("%s: aborting sNfaDisableEvent", __func__);
SyncEventGuard guard (sNfaDisableEvent);
sNfaDisableEvent.notifyOne();
}
@@ -731,7 +731,7 @@
sIsDisabling = false;
}
PowerSwitch::getInstance ().initialize (PowerSwitch::UNKNOWN_LEVEL);
- ALOGE ("%s: crash NFC service", __func__);
+ ALOGE("%s: crash NFC service", __func__);
//////////////////////////////////////////////
//crash the NFC service process so it can restart automatically
abort ();
@@ -744,7 +744,7 @@
break;
default:
- ALOGD ("%s: unhandled event", __func__);
+ ALOGV("%s: unhandled event", __func__);
break;
}
}
@@ -840,15 +840,15 @@
*******************************************************************************/
static jint nfcManager_doRegisterT3tIdentifier(JNIEnv* e, jobject, jbyteArray t3tIdentifier)
{
- ALOGD ("%s: enter", __func__);
+ ALOGV("%s: enter", __func__);
ScopedByteArrayRO bytes(e, t3tIdentifier);
uint8_t* buf = const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(&bytes[0]));
size_t bufLen = bytes.size();
int handle = RoutingManager::getInstance().registerT3tIdentifier(buf, bufLen);
- ALOGD ("%s: handle=%d", __func__, handle);
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: handle=%d", __func__, handle);
+ ALOGV("%s: exit", __func__);
return handle;
}
@@ -867,11 +867,11 @@
*******************************************************************************/
static void nfcManager_doDeregisterT3tIdentifier(JNIEnv*, jobject, jint handle)
{
- ALOGD ("%s: enter; handle=%d", __func__, handle);
+ ALOGV("%s: enter; handle=%d", __func__, handle);
RoutingManager::getInstance().deregisterT3tIdentifier(handle);
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
}
/*******************************************************************************
@@ -887,9 +887,9 @@
*******************************************************************************/
static jint nfcManager_getLfT3tMax(JNIEnv*, jobject)
{
- ALOGD ("%s: enter", __func__);
- ALOGD ("LF_T3T_MAX=%d", sLfT3tMax);
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: enter", __func__);
+ ALOGV("LF_T3T_MAX=%d", sLfT3tMax);
+ ALOGV("%s: exit", __func__);
return sLfT3tMax;
}
@@ -907,7 +907,7 @@
*******************************************************************************/
static jboolean nfcManager_doInitialize (JNIEnv* e, jobject o)
{
- ALOGD ("%s: enter; ver=%s nfa=%s NCI_VERSION=0x%02X",
+ ALOGV("%s: enter; ver=%s nfa=%s NCI_VERSION=0x%02X",
__func__, nfca_version_string, nfa_version_string, NCI_VERSION);
tNFA_STATUS stat = NFA_STATUS_OK;
@@ -915,7 +915,7 @@
if (sIsNfaEnabled)
{
- ALOGD ("%s: already enabled", __func__);
+ ALOGV("%s: already enabled", __func__);
goto TheEnd;
}
@@ -970,7 +970,7 @@
nat->tech_mask = num;
else
nat->tech_mask = DEFAULT_TECH_MASK;
- ALOGD ("%s: tag polling tech mask=0x%X", __func__, nat->tech_mask);
+ ALOGV("%s: tag polling tech mask=0x%X", __func__, nat->tech_mask);
}
// if this value exists, set polling interval.
@@ -990,7 +990,7 @@
{
sNfaGetConfigEvent.wait ();
if (sCurrentConfigLen >= 4 || sConfig[1] == NCI_PARAM_ID_LF_T3T_MAX) {
- ALOGD("%s: lfT3tMax=%d", __func__, sConfig[3]);
+ ALOGV("%s: lfT3tMax=%d", __func__, sConfig[3]);
sLfT3tMax = sConfig[3];
}
}
@@ -1002,7 +1002,7 @@
}
}
- ALOGE ("%s: fail nfa enable; error=0x%X", __func__, stat);
+ ALOGE("%s: fail nfa enable; error=0x%X", __func__, stat);
if (sIsNfaEnabled)
{
@@ -1016,7 +1016,7 @@
TheEnd:
if (sIsNfaEnabled)
PowerSwitch::getInstance ().setLevel (PowerSwitch::LOW_POWER);
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
return sIsNfaEnabled ? JNI_TRUE : JNI_FALSE;
}
@@ -1045,11 +1045,11 @@
tech_mask = (tNFA_TECHNOLOGY_MASK)nat->tech_mask;
else if (technologies_mask != -1)
tech_mask = (tNFA_TECHNOLOGY_MASK) technologies_mask;
- ALOGD ("%s: enter; tech_mask = %02x", __func__, tech_mask);
+ ALOGV("%s: enter; tech_mask = %02x", __func__, tech_mask);
if (sDiscoveryEnabled && !restart)
{
- ALOGE ("%s: already discovering", __func__);
+ ALOGE("%s: already discovering", __func__);
return;
}
@@ -1070,7 +1070,7 @@
// Start P2P listening if tag polling was enabled
if (sPollingEnabled)
{
- ALOGD ("%s: Enable p2pListening", __func__);
+ ALOGV("%s: Enable p2pListening", __func__);
if (enable_p2p && !sP2pEnabled) {
sP2pEnabled = true;
@@ -1120,7 +1120,7 @@
PowerSwitch::getInstance ().setModeOn (PowerSwitch::DISCOVERY);
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
}
@@ -1138,12 +1138,12 @@
void nfcManager_disableDiscovery (JNIEnv* e, jobject o)
{
tNFA_STATUS status = NFA_STATUS_OK;
- ALOGD ("%s: enter;", __func__);
+ ALOGV("%s: enter;", __func__);
pn544InteropAbortNow ();
if (sDiscoveryEnabled == false)
{
- ALOGD ("%s: already disabled", __func__);
+ ALOGV("%s: already disabled", __func__);
goto TheEnd;
}
@@ -1160,7 +1160,7 @@
if (! PowerSwitch::getInstance ().setModeOff (PowerSwitch::DISCOVERY))
PowerSwitch::getInstance ().setLevel (PowerSwitch::LOW_POWER);
TheEnd:
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
}
void enableDisableLptd (bool enable)
@@ -1232,13 +1232,13 @@
ScopedUtfChars serviceName(e, sn);
- ALOGD ("%s: enter: sap=%i; name=%s; miu=%i; rw=%i; buffLen=%i", __func__, nSap, serviceName.c_str(), miu, rw, linearBufferLength);
+ ALOGV("%s: enter: sap=%i; name=%s; miu=%i; rw=%i; buffLen=%i", __func__, nSap, serviceName.c_str(), miu, rw, linearBufferLength);
/* Create new NativeLlcpServiceSocket object */
jobject serviceSocket = NULL;
if (nfc_jni_cache_object_local(e, gNativeLlcpServiceSocketClassName, &(serviceSocket)) == -1)
{
- ALOGE ("%s: Llcp socket object creation error", __func__);
+ ALOGE("%s: Llcp socket object creation error", __func__);
return NULL;
}
@@ -1262,25 +1262,25 @@
/* Set socket handle to be the same as the NfaHandle*/
f = e->GetFieldID(clsNativeLlcpServiceSocket.get(), "mHandle", "I");
e->SetIntField(serviceSocket, f, (jint) jniHandle);
- ALOGD ("%s: socket Handle = 0x%X", __func__, jniHandle);
+ ALOGV("%s: socket Handle = 0x%X", __func__, jniHandle);
/* Set socket linear buffer length */
f = e->GetFieldID(clsNativeLlcpServiceSocket.get(), "mLocalLinearBufferLength", "I");
e->SetIntField(serviceSocket, f,(jint)linearBufferLength);
- ALOGD ("%s: buffer length = %d", __func__, linearBufferLength);
+ ALOGV("%s: buffer length = %d", __func__, linearBufferLength);
/* Set socket MIU */
f = e->GetFieldID(clsNativeLlcpServiceSocket.get(), "mLocalMiu", "I");
e->SetIntField(serviceSocket, f,(jint)miu);
- ALOGD ("%s: MIU = %d", __func__, miu);
+ ALOGV("%s: MIU = %d", __func__, miu);
/* Set socket RW */
f = e->GetFieldID(clsNativeLlcpServiceSocket.get(), "mLocalRw", "I");
e->SetIntField(serviceSocket, f,(jint)rw);
- ALOGD ("%s: RW = %d", __func__, rw);
+ ALOGV("%s: RW = %d", __func__, rw);
sLastError = 0;
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
return serviceSocket;
}
@@ -1298,7 +1298,7 @@
*******************************************************************************/
static jint nfcManager_doGetLastError(JNIEnv*, jobject)
{
- ALOGD ("%s: last error=%i", __func__, sLastError);
+ ALOGV("%s: last error=%i", __func__, sLastError);
return sLastError;
}
@@ -1316,7 +1316,7 @@
*******************************************************************************/
static jboolean nfcManager_doDeinitialize (JNIEnv*, jobject)
{
- ALOGD ("%s: enter", __func__);
+ ALOGV("%s: enter", __func__);
sIsDisabling = true;
@@ -1331,13 +1331,13 @@
tNFA_STATUS stat = NFA_Disable (TRUE /* graceful */);
if (stat == NFA_STATUS_OK)
{
- ALOGD ("%s: wait for completion", __func__);
+ ALOGV("%s: wait for completion", __func__);
sNfaDisableEvent.wait (); //wait for NFA command to finish
PeerToPeer::getInstance ().handleNfcOnOff (false);
}
else
{
- ALOGE ("%s: fail disable; error=0x%X", __func__, stat);
+ ALOGE("%s: fail disable; error=0x%X", __func__, stat);
}
}
nativeNfcTag_abortWaits();
@@ -1361,7 +1361,7 @@
NfcAdaptation& theInstance = NfcAdaptation::GetInstance();
theInstance.Finalize();
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
return JNI_TRUE;
}
@@ -1383,7 +1383,7 @@
*******************************************************************************/
static jobject nfcManager_doCreateLlcpSocket (JNIEnv* e, jobject, jint nSap, jint miu, jint rw, jint linearBufferLength)
{
- ALOGD ("%s: enter; sap=%d; miu=%d; rw=%d; buffer len=%d", __func__, nSap, miu, rw, linearBufferLength);
+ ALOGV("%s: enter; sap=%d; miu=%d; rw=%d; buffer len=%d", __func__, nSap, miu, rw, linearBufferLength);
PeerToPeer::tJNI_HANDLE jniHandle = PeerToPeer::getInstance().getNewJniHandle ();
PeerToPeer::getInstance().createClient (jniHandle, miu, rw);
@@ -1392,7 +1392,7 @@
jobject clientSocket = NULL;
if (nfc_jni_cache_object_local(e, gNativeLlcpSocketClassName, &(clientSocket)) == -1)
{
- ALOGE ("%s: fail Llcp socket creation", __func__);
+ ALOGE("%s: fail Llcp socket creation", __func__);
return clientSocket;
}
@@ -1401,7 +1401,7 @@
if (e->ExceptionCheck())
{
e->ExceptionClear();
- ALOGE ("%s: fail get class object", __func__);
+ ALOGE("%s: fail get class object", __func__);
return clientSocket;
}
@@ -1423,7 +1423,7 @@
f = e->GetFieldID (clsNativeLlcpSocket.get(), "mLocalRw", "I");
e->SetIntField (clientSocket, f, (jint) rw);
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
return clientSocket;
}
@@ -1443,7 +1443,7 @@
*******************************************************************************/
static jobject nfcManager_doCreateLlcpConnectionlessSocket (JNIEnv *, jobject, jint nSap, jstring /*sn*/)
{
- ALOGD ("%s: nSap=0x%X", __func__, nSap);
+ ALOGV("%s: nSap=0x%X", __func__, nSap);
return NULL;
}
@@ -1494,7 +1494,7 @@
*******************************************************************************/
static jboolean nfcManager_doCheckLlcp(JNIEnv*, jobject)
{
- ALOGD("%s", __func__);
+ ALOGV("%s", __func__);
return JNI_TRUE;
}
@@ -1510,7 +1510,7 @@
*******************************************************************************/
static jboolean nfcManager_doActivateLlcp(JNIEnv*, jobject)
{
- ALOGD("%s", __func__);
+ ALOGV("%s", __func__);
return JNI_TRUE;
}
@@ -1543,13 +1543,13 @@
*******************************************************************************/
static jboolean nfcManager_doDownload(JNIEnv*, jobject)
{
- ALOGD ("%s: enter", __func__);
+ ALOGV("%s: enter", __func__);
NfcAdaptation& theInstance = NfcAdaptation::GetInstance();
theInstance.Initialize(); //start GKI, NCI task, NFC task
theInstance.DownloadFirmware ();
theInstance.Finalize();
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
return JNI_TRUE;
}
@@ -1565,7 +1565,7 @@
*******************************************************************************/
static void nfcManager_doResetTimeouts(JNIEnv*, jobject)
{
- ALOGD ("%s", __func__);
+ ALOGV("%s", __func__);
NfcTag::getInstance().resetAllTransceiveTimeouts ();
}
@@ -1590,7 +1590,7 @@
ALOGE("%s: Timeout must be positive.",__func__);
return false;
}
- ALOGD ("%s: tech=%d, timeout=%d", __func__, tech, timeout);
+ ALOGV("%s: tech=%d, timeout=%d", __func__, tech, timeout);
NfcTag::getInstance().setTransceiveTimeout (tech, timeout);
return true;
}
@@ -1611,7 +1611,7 @@
static jint nfcManager_doGetTimeout(JNIEnv*, jobject, jint tech)
{
int timeout = NfcTag::getInstance().getTransceiveTimeout (tech);
- ALOGD ("%s: tech=%d, timeout=%d", __func__, tech, timeout);
+ ALOGV("%s: tech=%d, timeout=%d", __func__, tech, timeout);
return timeout;
}
@@ -1651,7 +1651,7 @@
*******************************************************************************/
static void nfcManager_doSetP2pInitiatorModes (JNIEnv *e, jobject o, jint modes)
{
- ALOGD ("%s: modes=0x%X", __func__, modes);
+ ALOGV("%s: modes=0x%X", __func__, modes);
struct nfc_jni_native_data *nat = getNative(e, o);
tNFA_TECHNOLOGY_MASK mask = 0;
@@ -1679,7 +1679,7 @@
*******************************************************************************/
static void nfcManager_doSetP2pTargetModes (JNIEnv*, jobject, jint modes)
{
- ALOGD ("%s: modes=0x%X", __func__, modes);
+ ALOGV("%s: modes=0x%X", __func__, modes);
// Map in the right modes
tNFA_TECHNOLOGY_MASK mask = 0;
if (modes & 0x01) mask |= NFA_TECHNOLOGY_MASK_A;
@@ -1805,9 +1805,9 @@
*******************************************************************************/
int register_com_android_nfc_NativeNfcManager (JNIEnv *e)
{
- ALOGD ("%s: enter", __func__);
+ ALOGV("%s: enter", __func__);
PowerSwitch::getInstance ().initialize (PowerSwitch::UNKNOWN_LEVEL);
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
return jniRegisterNativeMethods (e, gNativeNfcManagerClassName, gMethods, NELEM (gMethods));
}
@@ -1826,7 +1826,7 @@
{
tNFA_STATUS status = NFA_STATUS_FAILED;
- ALOGD ("%s: is start=%d", __func__, isStart);
+ ALOGV("%s: is start=%d", __func__, isStart);
SyncEventGuard guard (sNfaEnableDisablePollingEvent);
status = isStart ? NFA_StartRfDiscovery () : NFA_StopRfDiscovery ();
if (status == NFA_STATUS_OK)
@@ -1836,7 +1836,7 @@
}
else
{
- ALOGE ("%s: Failed to start/stop RF discovery; error=0x%X", __func__, status);
+ ALOGE("%s: Failed to start/stop RF discovery; error=0x%X", __func__, status);
}
}
@@ -1888,7 +1888,7 @@
actualLen = GetStrValue(NAME_POLL_FREQUENCY, (char*)polling_frequency, 8);
if (actualLen == 8)
{
- ALOGD ("%s: polling frequency", __func__);
+ ALOGV("%s: polling frequency", __func__);
memset (&nfa_dm_disc_freq_cfg, 0, sizeof(nfa_dm_disc_freq_cfg));
nfa_dm_disc_freq_cfg.pa = polling_frequency [0];
nfa_dm_disc_freq_cfg.pb = polling_frequency [1];
@@ -1929,14 +1929,14 @@
*******************************************************************************/
void startStopPolling (bool isStartPolling)
{
- ALOGD ("%s: enter; isStart=%u", __func__, isStartPolling);
+ ALOGV("%s: enter; isStart=%u", __func__, isStartPolling);
startRfDiscovery (false);
if (isStartPolling) startPolling_rfDiscoveryDisabled(0);
else stopPolling_rfDiscoveryDisabled();
startRfDiscovery (true);
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
}
@@ -1950,17 +1950,17 @@
else if (tech_mask == 0) tech_mask = DEFAULT_TECH_MASK;
SyncEventGuard guard (sNfaEnableDisablePollingEvent);
- ALOGD ("%s: enable polling", __func__);
+ ALOGV("%s: enable polling", __func__);
stat = NFA_EnablePolling (tech_mask);
if (stat == NFA_STATUS_OK)
{
- ALOGD ("%s: wait for enable event", __func__);
+ ALOGV("%s: wait for enable event", __func__);
sPollingEnabled = true;
sNfaEnableDisablePollingEvent.wait (); //wait for NFA_POLL_ENABLED_EVT
}
else
{
- ALOGE ("%s: fail enable polling; error=0x%X", __func__, stat);
+ ALOGE("%s: fail enable polling; error=0x%X", __func__, stat);
}
return stat;
@@ -1970,13 +1970,13 @@
tNFA_STATUS stat = NFA_STATUS_FAILED;
SyncEventGuard guard (sNfaEnableDisablePollingEvent);
- ALOGD ("%s: disable polling", __func__);
+ ALOGV("%s: disable polling", __func__);
stat = NFA_DisablePolling ();
if (stat == NFA_STATUS_OK) {
sPollingEnabled = false;
sNfaEnableDisablePollingEvent.wait (); //wait for NFA_POLL_DISABLED_EVT
} else {
- ALOGE ("%s: fail disable polling; error=0x%X", __func__, stat);
+ ALOGE("%s: fail disable polling; error=0x%X", __func__, stat);
}
return stat;
diff --git a/nci/jni/NativeNfcTag.cpp b/nci/jni/NativeNfcTag.cpp
index 1fdb4c8..6361bc9 100644
--- a/nci/jni/NativeNfcTag.cpp
+++ b/nci/jni/NativeNfcTag.cpp
@@ -133,7 +133,7 @@
*******************************************************************************/
void nativeNfcTag_abortWaits ()
{
- ALOGD ("%s", __func__);
+ ALOGV("%s", __func__);
{
SyncEventGuard g (sReadEvent);
sReadEvent.notifyOne ();
@@ -173,7 +173,7 @@
*******************************************************************************/
void nativeNfcTag_doReadCompleted (tNFA_STATUS status)
{
- ALOGD ("%s: status=0x%X; is reading=%u", __func__, status, sIsReadingNdefMessage);
+ ALOGV("%s: status=0x%X; is reading=%u", __func__, status, sIsReadingNdefMessage);
if (sIsReadingNdefMessage == false)
return; //not reading NDEF message right now, so just return
@@ -218,21 +218,21 @@
*******************************************************************************/
static void ndefHandlerCallback (tNFA_NDEF_EVT event, tNFA_NDEF_EVT_DATA *eventData)
{
- ALOGD ("%s: event=%u, eventData=%p", __func__, event, eventData);
+ ALOGV("%s: event=%u, eventData=%p", __func__, event, eventData);
switch (event)
{
case NFA_NDEF_REGISTER_EVT:
{
tNFA_NDEF_REGISTER& ndef_reg = eventData->ndef_reg;
- ALOGD ("%s: NFA_NDEF_REGISTER_EVT; status=0x%X; h=0x%X", __func__, ndef_reg.status, ndef_reg.ndef_type_handle);
+ ALOGV("%s: NFA_NDEF_REGISTER_EVT; status=0x%X; h=0x%X", __func__, ndef_reg.status, ndef_reg.ndef_type_handle);
sNdefTypeHandlerHandle = ndef_reg.ndef_type_handle;
}
break;
case NFA_NDEF_DATA_EVT:
{
- ALOGD ("%s: NFA_NDEF_DATA_EVT; data_len = %u", __func__, eventData->ndef_data.len);
+ ALOGV("%s: NFA_NDEF_DATA_EVT; data_len = %u", __func__, eventData->ndef_data.len);
sReadDataLen = eventData->ndef_data.len;
sReadData = (uint8_t*) malloc (sReadDataLen);
memcpy (sReadData, eventData->ndef_data.p_data, eventData->ndef_data.len);
@@ -240,7 +240,7 @@
break;
default:
- ALOGE ("%s: Unknown event %u ????", __func__, event);
+ ALOGE("%s: Unknown event %u ????", __func__, event);
break;
}
}
@@ -259,7 +259,7 @@
*******************************************************************************/
static jbyteArray nativeNfcTag_doRead (JNIEnv* e, jobject)
{
- ALOGD ("%s: enter", __func__);
+ ALOGV("%s: enter", __func__);
tNFA_STATUS status = NFA_STATUS_FAILED;
jbyteArray buf = NULL;
@@ -289,14 +289,14 @@
if (sReadDataLen > 0) //if stack actually read data from the tag
{
- ALOGD ("%s: read %u bytes", __func__, sReadDataLen);
+ ALOGV("%s: read %u bytes", __func__, sReadDataLen);
buf = e->NewByteArray (sReadDataLen);
e->SetByteArrayRegion (buf, 0, sReadDataLen, (jbyte*) sReadData);
}
}
else
{
- ALOGD ("%s: create empty buffer", __func__);
+ ALOGV("%s: create empty buffer", __func__);
sReadDataLen = 0;
sReadData = (uint8_t*) malloc (1);
buf = e->NewByteArray (sReadDataLen);
@@ -310,7 +310,7 @@
}
sReadDataLen = 0;
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
return buf;
}
@@ -378,12 +378,12 @@
ScopedByteArrayRO bytes(e, buf);
uint8_t* p_data = const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(&bytes[0])); // TODO: const-ness API bug in NFA_RwWriteNDef!
- ALOGD ("%s: enter; len = %zu", __func__, bytes.size());
+ ALOGV("%s: enter; len = %zu", __func__, bytes.size());
/* Create the write semaphore */
if (sem_init (&sWriteSem, 0, 0) == -1)
{
- ALOGE ("%s: semaphore creation failed (errno=0x%08x)", __func__, errno);
+ ALOGE("%s: semaphore creation failed (errno=0x%08x)", __func__, errno);
return JNI_FALSE;
}
@@ -394,7 +394,7 @@
//and tag is capable of storing NDEF message
if (sCheckNdefCapable)
{
- ALOGD ("%s: try format", __func__);
+ ALOGV("%s: try format", __func__);
sem_init (&sFormatSem, 0, 0);
sFormatOk = false;
if (sCurrentConnectedTargetProtocol == NFA_PROTOCOL_MIFARE)
@@ -405,7 +405,7 @@
status = EXTNS_MfcFormatTag (mfc_key1, sizeof(mfc_key1));
if (status != NFA_STATUS_OK)
{
- ALOGE ("%s: can't format mifare classic tag", __func__);
+ ALOGE("%s: can't format mifare classic tag", __func__);
sem_destroy (&sFormatSem);
goto TheEnd;
}
@@ -418,7 +418,7 @@
status = EXTNS_MfcFormatTag (mfc_key2, sizeof(mfc_key2));
if (status != NFA_STATUS_OK)
{
- ALOGE ("%s: can't format mifare classic tag", __func__);
+ ALOGE("%s: can't format mifare classic tag", __func__);
sem_destroy (&sFormatSem);
goto TheEnd;
}
@@ -433,7 +433,7 @@
if (sFormatOk == false) //if format operation failed
goto TheEnd;
}
- ALOGD ("%s: try write", __func__);
+ ALOGV("%s: try write", __func__);
status = NFA_RwWriteNDef (p_data, bytes.size());
}
else if (bytes.size() == 0)
@@ -441,7 +441,7 @@
//if (NXP TagWriter wants to erase tag) then create and write an empty ndef message
NDEF_MsgInit (buffer, maxBufferSize, &curDataSize);
status = NDEF_MsgAddRec (buffer, maxBufferSize, &curDataSize, NDEF_TNF_EMPTY, NULL, 0, NULL, 0, NULL, 0);
- ALOGD ("%s: create empty ndef msg; status=%u; size=%u", __func__, status, curDataSize);
+ ALOGV("%s: create empty ndef msg; status=%u; size=%u", __func__, status, curDataSize);
if (sCurrentConnectedTargetProtocol == NFA_PROTOCOL_MIFARE)
{
status = EXTNS_MfcWriteNDef (buffer, curDataSize);
@@ -453,7 +453,7 @@
}
else
{
- ALOGD ("%s: NFA_RwWriteNDef", __func__);
+ ALOGV("%s: NFA_RwWriteNDef", __func__);
if (sCurrentConnectedTargetProtocol == NFA_PROTOCOL_MIFARE)
{
status = EXTNS_MfcWriteNDef (p_data, bytes.size());
@@ -466,7 +466,7 @@
if (status != NFA_STATUS_OK)
{
- ALOGE ("%s: write/format error=%d", __func__, status);
+ ALOGE("%s: write/format error=%d", __func__, status);
goto TheEnd;
}
@@ -474,7 +474,7 @@
sWriteOk = false;
if (sem_wait (&sWriteSem))
{
- ALOGE ("%s: wait semaphore (errno=0x%08x)", __func__, errno);
+ ALOGE("%s: wait semaphore (errno=0x%08x)", __func__, errno);
goto TheEnd;
}
@@ -484,10 +484,10 @@
/* Destroy semaphore */
if (sem_destroy (&sWriteSem))
{
- ALOGE ("%s: failed destroy semaphore (errno=0x%08x)", __func__, errno);
+ ALOGE("%s: failed destroy semaphore (errno=0x%08x)", __func__, errno);
}
sWriteWaitingForComplete = JNI_FALSE;
- ALOGD ("%s: exit; result=%d", __func__, result);
+ ALOGV("%s: exit; result=%d", __func__, result);
return result;
}
@@ -560,21 +560,21 @@
*******************************************************************************/
static jint nativeNfcTag_doConnect (JNIEnv*, jobject, jint targetHandle)
{
- ALOGD ("%s: targetHandle = %d", __func__, targetHandle);
+ ALOGV("%s: targetHandle = %d", __func__, targetHandle);
int i = targetHandle;
NfcTag& natTag = NfcTag::getInstance ();
int retCode = NFCSTATUS_SUCCESS;
if (i >= NfcTag::MAX_NUM_TECHNOLOGY)
{
- ALOGE ("%s: Handle not found", __func__);
+ ALOGE("%s: Handle not found", __func__);
retCode = NFCSTATUS_FAILED;
goto TheEnd;
}
if (natTag.getActivationState() != NfcTag::Active)
{
- ALOGE ("%s: tag already deactivated", __func__);
+ ALOGE("%s: tag already deactivated", __func__);
retCode = NFCSTATUS_FAILED;
goto TheEnd;
}
@@ -584,14 +584,14 @@
if (sCurrentConnectedTargetProtocol != NFC_PROTOCOL_ISO_DEP)
{
- ALOGD ("%s() Nfc type = %d, do nothing for non ISO_DEP", __func__, sCurrentConnectedTargetProtocol);
+ ALOGV("%s() Nfc type = %d, do nothing for non ISO_DEP", __func__, sCurrentConnectedTargetProtocol);
retCode = NFCSTATUS_SUCCESS;
goto TheEnd;
}
if (sCurrentConnectedTargetType == TARGET_TYPE_ISO14443_3A || sCurrentConnectedTargetType == TARGET_TYPE_ISO14443_3B)
{
- ALOGD ("%s: switching to tech: %d need to switch rf intf to frame", __func__, sCurrentConnectedTargetType);
+ ALOGV("%s: switching to tech: %d need to switch rf intf to frame", __func__, sCurrentConnectedTargetType);
retCode = switchRfInterface(NFA_INTERFACE_FRAME) ? NFA_STATUS_OK : NFA_STATUS_FAILED;
}
else
@@ -600,7 +600,7 @@
}
TheEnd:
- ALOGD ("%s: exit 0x%X", __func__, retCode);
+ ALOGV("%s: exit 0x%X", __func__, retCode);
return retCode;
}
@@ -618,7 +618,7 @@
*******************************************************************************/
static int reSelect (tNFA_INTF_TYPE rfInterface, bool fSwitchIfNeeded)
{
- ALOGD ("%s: enter; rf intf = %d, current intf = %d", __func__, rfInterface, sCurrentRfInterface);
+ ALOGV("%s: enter; rf intf = %d, current intf = %d", __func__, rfInterface, sCurrentRfInterface);
sRfInterfaceMutex.lock ();
@@ -639,7 +639,7 @@
//if tag has shutdown, abort this method
if (NfcTag::getInstance ().isNdefDetectionTimedOut())
{
- ALOGD ("%s: ndef detection timeout; break", __func__);
+ ALOGV("%s: ndef detection timeout; break", __func__);
rVal = STATUS_CODE_TARGET_LOST;
break;
}
@@ -648,16 +648,16 @@
SyncEventGuard g (sReconnectEvent);
gIsTagDeactivating = true;
sGotDeactivate = false;
- ALOGD ("%s: deactivate to sleep", __func__);
+ ALOGV("%s: deactivate to sleep", __func__);
if (NFA_STATUS_OK != (status = NFA_Deactivate (TRUE))) //deactivate to sleep state
{
- ALOGE ("%s: deactivate failed, status = %d", __func__, status);
+ ALOGE("%s: deactivate failed, status = %d", __func__, status);
break;
}
if (sReconnectEvent.wait (1000) == false) //if timeout occurred
{
- ALOGE ("%s: timeout waiting for deactivate", __func__);
+ ALOGE("%s: timeout waiting for deactivate", __func__);
}
}
@@ -669,7 +669,7 @@
if (NfcTag::getInstance ().getActivationState () != NfcTag::Sleep)
{
- ALOGE ("%s: tag is not in sleep", __func__);
+ ALOGE("%s: tag is not in sleep", __func__);
rVal = STATUS_CODE_TARGET_LOST;
break;
}
@@ -680,23 +680,23 @@
SyncEventGuard g2 (sReconnectEvent);
sConnectWaitingForComplete = JNI_TRUE;
- ALOGD ("%s: select interface %u", __func__, rfInterface);
+ ALOGV("%s: select interface %u", __func__, rfInterface);
gIsSelectingRfInterface = true;
if (NFA_STATUS_OK != (status = NFA_Select (natTag.mTechHandles[0], natTag.mTechLibNfcTypes[0], rfInterface)))
{
- ALOGE ("%s: NFA_Select failed, status = %d", __func__, status);
+ ALOGE("%s: NFA_Select failed, status = %d", __func__, status);
break;
}
sConnectOk = false;
if (sReconnectEvent.wait (1000) == false) //if timeout occured
{
- ALOGE ("%s: timeout waiting for select", __func__);
+ ALOGE("%s: timeout waiting for select", __func__);
break;
}
}
- ALOGD("%s: select completed; sConnectOk=%d", __func__, sConnectOk);
+ ALOGV("%s: select completed; sConnectOk=%d", __func__, sConnectOk);
if (NfcTag::getInstance ().getActivationState () != NfcTag::Active)
{
ALOGE("%s: tag is not active", __func__);
@@ -718,7 +718,7 @@
gIsTagDeactivating = false;
gIsSelectingRfInterface = false;
sRfInterfaceMutex.unlock ();
- ALOGD ("%s: exit; status=%d", __func__, rVal);
+ ALOGV("%s: exit; status=%d", __func__, rVal);
return rVal;
}
@@ -738,11 +738,11 @@
if (sCurrentConnectedTargetProtocol != NFC_PROTOCOL_ISO_DEP)
{
- ALOGD ("%s: protocol: %d not ISO_DEP, do nothing", __func__, natTag.mTechLibNfcTypes[0]);
+ ALOGV("%s: protocol: %d not ISO_DEP, do nothing", __func__, natTag.mTechLibNfcTypes[0]);
return true;
}
- ALOGD ("%s: new rf intf = %d, cur rf intf = %d", __func__, rfInterface, sCurrentRfInterface);
+ ALOGV("%s: new rf intf = %d, cur rf intf = %d", __func__, rfInterface, sCurrentRfInterface);
return (0 == reSelect(rfInterface, true));
}
@@ -761,13 +761,13 @@
*******************************************************************************/
static jint nativeNfcTag_doReconnect (JNIEnv*, jobject)
{
- ALOGD ("%s: enter", __func__);
+ ALOGV("%s: enter", __func__);
int retCode = NFCSTATUS_SUCCESS;
NfcTag& natTag = NfcTag::getInstance ();
if (natTag.getActivationState() != NfcTag::Active)
{
- ALOGE ("%s: tag already deactivated", __func__);
+ ALOGE("%s: tag already deactivated", __func__);
retCode = NFCSTATUS_FAILED;
goto TheEnd;
}
@@ -775,7 +775,7 @@
// special case for Kovio
if (sCurrentConnectedTargetProtocol == TARGET_TYPE_KOVIO_BARCODE)
{
- ALOGD ("%s: fake out reconnect for Kovio", __func__);
+ ALOGV("%s: fake out reconnect for Kovio", __func__);
goto TheEnd;
}
@@ -788,7 +788,7 @@
retCode = reSelect (NFA_INTERFACE_MIFARE, false);
TheEnd:
- ALOGD ("%s: exit 0x%X", __func__, retCode);
+ ALOGV("%s: exit 0x%X", __func__, retCode);
return retCode;
}
@@ -807,7 +807,7 @@
*******************************************************************************/
static jint nativeNfcTag_doHandleReconnect (JNIEnv *e, jobject o, jint targetHandle)
{
- ALOGD ("%s: targetHandle = %d", __func__, targetHandle);
+ ALOGV("%s: targetHandle = %d", __func__, targetHandle);
return nativeNfcTag_doConnect (e, o, targetHandle);
}
@@ -825,23 +825,23 @@
*******************************************************************************/
static jboolean nativeNfcTag_doDisconnect (JNIEnv*, jobject)
{
- ALOGD ("%s: enter", __func__);
+ ALOGV("%s: enter", __func__);
tNFA_STATUS nfaStat = NFA_STATUS_OK;
NfcTag::getInstance().resetAllTransceiveTimeouts ();
if (NfcTag::getInstance ().getActivationState () != NfcTag::Active)
{
- ALOGE ("%s: tag already deactivated", __func__);
+ ALOGE("%s: tag already deactivated", __func__);
goto TheEnd;
}
nfaStat = NFA_Deactivate (FALSE);
if (nfaStat != NFA_STATUS_OK)
- ALOGE ("%s: deactivate failed; error=0x%X", __func__, nfaStat);
+ ALOGE("%s: deactivate failed; error=0x%X", __func__, nfaStat);
TheEnd:
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
return (nfaStat == NFA_STATUS_OK) ? JNI_TRUE : JNI_FALSE;
}
@@ -861,7 +861,7 @@
void nativeNfcTag_doTransceiveStatus (tNFA_STATUS status, uint8_t* buf, uint32_t bufLen)
{
SyncEventGuard g (sTransceiveEvent);
- ALOGD ("%s: data len=%d", __func__, bufLen);
+ ALOGV("%s: data len=%d", __func__, bufLen);
if (sCurrentConnectedTargetProtocol == NFA_PROTOCOL_MIFARE)
{
@@ -874,7 +874,7 @@
if (!sWaitingForTransceive)
{
- ALOGE ("%s: drop data", __func__);
+ ALOGE("%s: drop data", __func__);
return;
}
sRxDataStatus = status;
@@ -889,7 +889,7 @@
void nativeNfcTag_notifyRfTimeout ()
{
SyncEventGuard g (sTransceiveEvent);
- ALOGD ("%s: waiting for transceive: %d", __func__, sWaitingForTransceive);
+ ALOGV("%s: waiting for transceive: %d", __func__, sWaitingForTransceive);
if (!sWaitingForTransceive)
return;
@@ -915,7 +915,7 @@
static jbyteArray nativeNfcTag_doTransceive (JNIEnv* e, jobject o, jbyteArray data, jboolean raw, jintArray statusTargetLost)
{
int timeout = NfcTag::getInstance ().getTransceiveTimeout (sCurrentConnectedTargetType);
- ALOGD ("%s: enter; raw=%u; timeout = %d", __func__, raw, timeout);
+ ALOGV("%s: enter; raw=%u; timeout = %d", __func__, raw, timeout);
bool waitOk = false;
bool isNack = false;
@@ -931,7 +931,7 @@
*targetLost = 1; //causes NFC service to throw TagLostException
e->ReleaseIntArrayElements (statusTargetLost, targetLost, 0);
}
- ALOGD ("%s: tag not active", __func__);
+ ALOGV("%s: tag not active", __func__);
return NULL;
}
@@ -972,7 +972,7 @@
if (status != NFA_STATUS_OK)
{
- ALOGE ("%s: fail send; error=%d", __func__, status);
+ ALOGE("%s: fail send; error=%d", __func__, status);
break;
}
waitOk = sTransceiveEvent.wait (timeout);
@@ -980,7 +980,7 @@
if (waitOk == false || sTransceiveRfTimeout) //if timeout occurred
{
- ALOGE ("%s: wait response timeout", __func__);
+ ALOGE("%s: wait response timeout", __func__);
if (targetLost)
*targetLost = 1; //causes NFC service to throw TagLostException
break;
@@ -988,13 +988,13 @@
if (NfcTag::getInstance ().getActivationState () != NfcTag::Active)
{
- ALOGE ("%s: already deactivated", __func__);
+ ALOGE("%s: already deactivated", __func__);
if (targetLost)
*targetLost = 1; //causes NFC service to throw TagLostException
break;
}
- ALOGD ("%s: response %zu bytes", __func__, sRxDataBuffer.size());
+ ALOGV("%s: response %zu bytes", __func__, sRxDataBuffer.size());
if ((natTag.getProtocol () == NFA_PROTOCOL_T2T) &&
natTag.isT2tNackResponse (sRxDataBuffer.data(), sRxDataBuffer.size()))
@@ -1009,9 +1009,9 @@
//Some Mifare Ultralight C tags enter the HALT state after it
//responds with a NACK. Need to perform a "reconnect" operation
//to wake it.
- ALOGD ("%s: try reconnect", __func__);
+ ALOGV("%s: try reconnect", __func__);
nativeNfcTag_doReconnect (NULL, NULL);
- ALOGD ("%s: reconnect finish", __func__);
+ ALOGV("%s: reconnect finish", __func__);
}
else if (sCurrentConnectedTargetProtocol == NFA_PROTOCOL_MIFARE)
{
@@ -1032,7 +1032,7 @@
e->SetByteArrayRegion (result.get (), 0, transDataLen, (const jbyte *) transData);
}
else
- ALOGE ("%s: Failed to allocate java byte array", __func__);
+ ALOGE("%s: Failed to allocate java byte array", __func__);
}
}
else
@@ -1044,7 +1044,7 @@
e->SetByteArrayRegion(result.get(), 0, sRxDataBuffer.size(), (const jbyte *) sRxDataBuffer.data());
}
else
- ALOGE ("%s: Failed to allocate java byte array", __func__);
+ ALOGE("%s: Failed to allocate java byte array", __func__);
} // else a nack is treated as a transceive failure to the upper layers
sRxDataBuffer.clear();
@@ -1055,7 +1055,7 @@
if (targetLost)
e->ReleaseIntArrayElements (statusTargetLost, targetLost, 0);
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
return result.release();
}
@@ -1075,7 +1075,7 @@
*******************************************************************************/
static jint nativeNfcTag_doGetNdefType (JNIEnv*, jobject, jint libnfcType, jint javaType)
{
- ALOGD ("%s: enter; libnfc type=%d; java type=%d", __func__, libnfcType, javaType);
+ ALOGV("%s: enter; libnfc type=%d; java type=%d", __func__, libnfcType, javaType);
jint ndefType = NDEF_UNKNOWN_TYPE;
// For NFA, libnfcType is mapped to the protocol value received
@@ -1105,7 +1105,7 @@
/* NFA_PROTOCOL_ISO15693, NFA_PROTOCOL_INVALID and others */
ndefType = NDEF_UNKNOWN_TYPE;
}
- ALOGD ("%s: exit; ndef type=%d", __func__, ndefType);
+ ALOGV("%s: exit; ndef type=%d", __func__, ndefType);
return ndefType;
}
@@ -1136,20 +1136,20 @@
if (!sCheckNdefWaitingForComplete)
{
- ALOGE ("%s: not waiting", __func__);
+ ALOGE("%s: not waiting", __func__);
return;
}
if (flags & RW_NDEF_FL_READ_ONLY)
- ALOGD ("%s: flag read-only", __func__);
+ ALOGV("%s: flag read-only", __func__);
if (flags & RW_NDEF_FL_FORMATED)
- ALOGD ("%s: flag formatted for ndef", __func__);
+ ALOGV("%s: flag formatted for ndef", __func__);
if (flags & RW_NDEF_FL_SUPPORTED)
- ALOGD ("%s: flag ndef supported", __func__);
+ ALOGV("%s: flag ndef supported", __func__);
if (flags & RW_NDEF_FL_UNKNOWN)
- ALOGD ("%s: flag all unknown", __func__);
+ ALOGV("%s: flag all unknown", __func__);
if (flags & RW_NDEF_FL_FORMATABLE)
- ALOGD ("%s: flag formattable", __func__);
+ ALOGV("%s: flag formattable", __func__);
sCheckNdefWaitingForComplete = JNI_FALSE;
sCheckNdefStatus = status;
@@ -1178,7 +1178,7 @@
}
else
{
- ALOGE ("%s: unknown status=0x%X", __func__, status);
+ ALOGE("%s: unknown status=0x%X", __func__, status);
sCheckNdefMaxSize = 0;
sCheckNdefCurrentSize = 0;
sCheckNdefCardReadOnly = false;
@@ -1204,12 +1204,12 @@
tNFA_STATUS status = NFA_STATUS_FAILED;
jint* ndef = NULL;
- ALOGD ("%s: enter", __func__);
+ ALOGV("%s: enter", __func__);
// special case for Kovio
if (sCurrentConnectedTargetProtocol == TARGET_TYPE_KOVIO_BARCODE)
{
- ALOGD ("%s: Kovio tag, no NDEF", __func__);
+ ALOGV("%s: Kovio tag, no NDEF", __func__);
ndef = e->GetIntArrayElements (ndefInfo, 0);
ndef[0] = 0;
ndef[1] = NDEF_MODE_READ_ONLY;
@@ -1224,17 +1224,17 @@
/* Create the write semaphore */
if (sem_init (&sCheckNdefSem, 0, 0) == -1)
{
- ALOGE ("%s: Check NDEF semaphore creation failed (errno=0x%08x)", __func__, errno);
+ ALOGE("%s: Check NDEF semaphore creation failed (errno=0x%08x)", __func__, errno);
return JNI_FALSE;
}
if (NfcTag::getInstance ().getActivationState () != NfcTag::Active)
{
- ALOGE ("%s: tag already deactivated", __func__);
+ ALOGE("%s: tag already deactivated", __func__);
goto TheEnd;
}
- ALOGD ("%s: try NFA_RwDetectNDef", __func__);
+ ALOGV("%s: try NFA_RwDetectNDef", __func__);
sCheckNdefWaitingForComplete = JNI_TRUE;
if (sCurrentConnectedTargetProtocol == NFA_PROTOCOL_MIFARE)
@@ -1248,14 +1248,14 @@
if (status != NFA_STATUS_OK)
{
- ALOGE ("%s: NFA_RwDetectNDef failed, status = 0x%X", __func__, status);
+ ALOGE("%s: NFA_RwDetectNDef failed, status = 0x%X", __func__, status);
goto TheEnd;
}
/* Wait for check NDEF completion status */
if (sem_wait (&sCheckNdefSem))
{
- ALOGE ("%s: Failed to wait for check NDEF semaphore (errno=0x%08x)", __func__, errno);
+ ALOGE("%s: Failed to wait for check NDEF semaphore (errno=0x%08x)", __func__, errno);
goto TheEnd;
}
@@ -1296,7 +1296,7 @@
}
else
{
- ALOGD ("%s: unknown status 0x%X", __func__, sCheckNdefStatus);
+ ALOGV("%s: unknown status 0x%X", __func__, sCheckNdefStatus);
status = sCheckNdefStatus;
}
@@ -1310,10 +1310,10 @@
/* Destroy semaphore */
if (sem_destroy (&sCheckNdefSem))
{
- ALOGE ("%s: Failed to destroy check NDEF semaphore (errno=0x%08x)", __func__, errno);
+ ALOGE("%s: Failed to destroy check NDEF semaphore (errno=0x%08x)", __func__, errno);
}
sCheckNdefWaitingForComplete = JNI_FALSE;
- ALOGD ("%s: exit; status=0x%X", __func__, status);
+ ALOGV("%s: exit; status=0x%X", __func__, status);
return status;
}
@@ -1364,7 +1364,7 @@
*******************************************************************************/
static jboolean nativeNfcTag_doPresenceCheck (JNIEnv*, jobject)
{
- ALOGD ("%s", __func__);
+ ALOGV("%s", __func__);
tNFA_STATUS status = NFA_STATUS_OK;
jboolean isPresent = JNI_FALSE;
@@ -1373,7 +1373,7 @@
// want to process as if the deactivate just happened.
if (sCurrentConnectedTargetProtocol == TARGET_TYPE_KOVIO_BARCODE)
{
- ALOGD ("%s: Kovio, force deactivate handling", __func__);
+ ALOGV("%s: Kovio, force deactivate handling", __func__);
tNFA_DEACTIVATED deactivated = {NFA_DEACTIVATE_TYPE_IDLE};
{
SyncEventGuard g (gDeactivatedEvent);
@@ -1392,13 +1392,13 @@
if (nfcManager_isNfcActive() == false)
{
- ALOGD ("%s: NFC is no longer active.", __func__);
+ ALOGV("%s: NFC is no longer active.", __func__);
return JNI_FALSE;
}
if (!sRfInterfaceMutex.tryLock())
{
- ALOGD ("%s: tag is being reSelected assume it is present", __func__);
+ ALOGV("%s: tag is being reSelected assume it is present", __func__);
return JNI_TRUE;
}
@@ -1406,7 +1406,7 @@
if (NfcTag::getInstance ().isActivated () == false)
{
- ALOGD ("%s: tag already deactivated", __func__);
+ ALOGV("%s: tag already deactivated", __func__);
return JNI_FALSE;
}
if (sCurrentConnectedTargetProtocol == NFA_PROTOCOL_MIFARE)
@@ -1429,7 +1429,7 @@
}
if (isPresent == JNI_FALSE)
- ALOGD ("%s: tag absent", __func__);
+ ALOGV("%s: tag absent", __func__);
return isPresent;
}
@@ -1508,7 +1508,7 @@
}
}
- ALOGD("%s: is formattable=%u", __func__, isFormattable);
+ ALOGV("%s: is formattable=%u", __func__, isFormattable);
return isFormattable;
}
@@ -1529,7 +1529,7 @@
static jboolean nativeNfcTag_doIsIsoDepNdefFormatable (JNIEnv *e, jobject o, jbyteArray pollBytes, jbyteArray actBytes)
{
uint8_t uidFake[] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 };
- ALOGD ("%s", __func__);
+ ALOGV("%s", __func__);
jbyteArray uidArray = e->NewByteArray (8);
e->SetByteArrayRegion (uidArray, 0, 8, (jbyte*) uidFake);
return nativeNfcTag_doIsNdefFormatable (e, o, 0, uidArray, pollBytes, actBytes);
@@ -1551,13 +1551,13 @@
*******************************************************************************/
static jboolean nativeNfcTag_makeMifareNdefFormat (JNIEnv *e, jobject o, uint8_t *key, uint32_t keySize)
{
- ALOGD ("%s: enter", __func__);
+ ALOGV("%s: enter", __func__);
tNFA_STATUS status = NFA_STATUS_OK;
status = nativeNfcTag_doReconnect (e, o);
if (status != NFA_STATUS_OK)
{
- ALOGD ("%s: reconnect error, status=%u", __func__, status);
+ ALOGV("%s: reconnect error, status=%u", __func__, status);
return JNI_FALSE;
}
@@ -1568,17 +1568,17 @@
if (status == NFA_STATUS_OK)
{
- ALOGD ("%s: wait for completion", __func__);
+ ALOGV("%s: wait for completion", __func__);
sem_wait (&sFormatSem);
status = sFormatOk ? NFA_STATUS_OK : NFA_STATUS_FAILED;
}
else
{
- ALOGE ("%s: error status=%u", __func__, status);
+ ALOGE("%s: error status=%u", __func__, status);
}
sem_destroy (&sFormatSem);
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
return (status == NFA_STATUS_OK) ? JNI_TRUE : JNI_FALSE;
}
@@ -1597,13 +1597,13 @@
*******************************************************************************/
static jboolean nativeNfcTag_doNdefFormat (JNIEnv *e, jobject o, jbyteArray)
{
- ALOGD ("%s: enter", __func__);
+ ALOGV("%s: enter", __func__);
tNFA_STATUS status = NFA_STATUS_OK;
// Do not try to format if tag is already deactivated.
if (NfcTag::getInstance ().isActivated () == false)
{
- ALOGD ("%s: tag already deactivated(no need to format)", __func__);
+ ALOGV("%s: tag already deactivated(no need to format)", __func__);
return JNI_FALSE;
}
@@ -1626,12 +1626,12 @@
status = NFA_RwFormatTag ();
if (status == NFA_STATUS_OK)
{
- ALOGD ("%s: wait for completion", __func__);
+ ALOGV("%s: wait for completion", __func__);
sem_wait (&sFormatSem);
status = sFormatOk ? NFA_STATUS_OK : NFA_STATUS_FAILED;
}
else
- ALOGE ("%s: error status=%u", __func__, status);
+ ALOGE("%s: error status=%u", __func__, status);
sem_destroy (&sFormatSem);
if (sCurrentConnectedTargetProtocol == NFA_PROTOCOL_ISO_DEP)
@@ -1639,7 +1639,7 @@
int retCode = NFCSTATUS_SUCCESS;
retCode = nativeNfcTag_doReconnect (e, o);
}
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
return (status == NFA_STATUS_OK) ? JNI_TRUE : JNI_FALSE;
}
@@ -1687,12 +1687,12 @@
sMakeReadonlyStatus = NFA_STATUS_FAILED;
- ALOGD ("%s", __func__);
+ ALOGV("%s", __func__);
/* Create the make_readonly semaphore */
if (sem_init (&sMakeReadonlySem, 0, 0) == -1)
{
- ALOGE ("%s: Make readonly semaphore creation failed (errno=0x%08x)", __func__, errno);
+ ALOGE("%s: Make readonly semaphore creation failed (errno=0x%08x)", __func__, errno);
return JNI_FALSE;
}
@@ -1720,7 +1720,7 @@
/* Destroy semaphore */
if (sem_destroy (&sMakeReadonlySem))
{
- ALOGE ("%s: Failed to destroy read_only semaphore (errno=0x%08x)", __func__, errno);
+ ALOGE("%s: Failed to destroy read_only semaphore (errno=0x%08x)", __func__, errno);
}
sMakeReadonlyWaitingForComplete = JNI_FALSE;
return result;
@@ -1744,7 +1744,7 @@
jboolean result = JNI_FALSE;
tNFA_STATUS status;
- ALOGD ("%s", __func__);
+ ALOGV("%s", __func__);
if (sCurrentConnectedTargetProtocol == NFA_PROTOCOL_MIFARE)
{
@@ -1761,7 +1761,7 @@
/* Create the make_readonly semaphore */
if (sem_init (&sMakeReadonlySem, 0, 0) == -1)
{
- ALOGE ("%s: Make readonly semaphore creation failed (errno=0x%08x)", __func__, errno);
+ ALOGE("%s: Make readonly semaphore creation failed (errno=0x%08x)", __func__, errno);
return JNI_FALSE;
}
@@ -1774,20 +1774,20 @@
status = NFA_RwSetTagReadOnly (FALSE); //try soft lock
if (status != NFA_STATUS_OK)
{
- ALOGE ("%s: fail soft lock, status=%d", __func__, status);
+ ALOGE("%s: fail soft lock, status=%d", __func__, status);
goto TheEnd;
}
}
else if (status != NFA_STATUS_OK)
{
- ALOGE ("%s: fail hard lock, status=%d", __func__, status);
+ ALOGE("%s: fail hard lock, status=%d", __func__, status);
goto TheEnd;
}
/* Wait for check NDEF completion status */
if (sem_wait (&sMakeReadonlySem))
{
- ALOGE ("%s: Failed to wait for make_readonly semaphore (errno=0x%08x)", __func__, errno);
+ ALOGE("%s: Failed to wait for make_readonly semaphore (errno=0x%08x)", __func__, errno);
goto TheEnd;
}
@@ -1800,7 +1800,7 @@
/* Destroy semaphore */
if (sem_destroy (&sMakeReadonlySem))
{
- ALOGE ("%s: Failed to destroy read_only semaphore (errno=0x%08x)", __func__, errno);
+ ALOGE("%s: Failed to destroy read_only semaphore (errno=0x%08x)", __func__, errno);
}
sMakeReadonlyWaitingForComplete = JNI_FALSE;
return result;
@@ -1821,7 +1821,7 @@
//from the NFA_NDEF_DATA_EVT;
void nativeNfcTag_registerNdefTypeHandler ()
{
- ALOGD ("%s", __func__);
+ ALOGV("%s", __func__);
sNdefTypeHandlerHandle = NFA_HANDLE_INVALID;
NFA_RegisterNDefTypeHandler (TRUE, NFA_TNF_DEFAULT, (uint8_t *) "", 0, ndefHandlerCallback);
EXTNS_MfcRegisterNDefTypeHandler (ndefHandlerCallback);
@@ -1839,7 +1839,7 @@
*******************************************************************************/
void nativeNfcTag_deregisterNdefTypeHandler ()
{
- ALOGD ("%s", __func__);
+ ALOGV("%s", __func__);
NFA_DeregisterNDefTypeHandler (sNdefTypeHandlerHandle);
sNdefTypeHandlerHandle = NFA_HANDLE_INVALID;
}
@@ -1880,7 +1880,7 @@
*******************************************************************************/
int register_com_android_nfc_NativeNfcTag (JNIEnv *e)
{
- ALOGD ("%s", __func__);
+ ALOGV("%s", __func__);
return jniRegisterNativeMethods (e, gNativeNfcTagClassName, gMethods, NELEM (gMethods));
}
diff --git a/nci/jni/NativeP2pDevice.cpp b/nci/jni/NativeP2pDevice.cpp
index 227a53f..b669a95 100644
--- a/nci/jni/NativeP2pDevice.cpp
+++ b/nci/jni/NativeP2pDevice.cpp
@@ -15,7 +15,7 @@
*/
#include "_OverrideLog.h"
-#include <android/log.h>
+#include <log/log.h>
#include "NfcJniUtil.h"
#include "JavaClassConstants.h"
@@ -28,35 +28,35 @@
static jboolean nativeP2pDeviceDoConnect (JNIEnv*, jobject)
{
- ALOGD ("%s", __func__);
+ ALOGV("%s", __func__);
return JNI_TRUE;
}
static jboolean nativeP2pDeviceDoDisconnect (JNIEnv*, jobject)
{
- ALOGD ("%s", __func__);
+ ALOGV("%s", __func__);
return JNI_TRUE;
}
static jbyteArray nativeP2pDeviceDoTransceive (JNIEnv*, jobject, jbyteArray)
{
- ALOGD ("%s", __func__);
+ ALOGV("%s", __func__);
return NULL;
}
static jbyteArray nativeP2pDeviceDoReceive (JNIEnv*, jobject)
{
- ALOGD ("%s", __func__);
+ ALOGV("%s", __func__);
return NULL;
}
static jboolean nativeP2pDeviceDoSend (JNIEnv*, jobject, jbyteArray)
{
- ALOGD ("%s", __func__);
+ ALOGV("%s", __func__);
return JNI_TRUE;
}
diff --git a/nci/jni/NfcJniUtil.cpp b/nci/jni/NfcJniUtil.cpp
index a5eacef..0357018 100755
--- a/nci/jni/NfcJniUtil.cpp
+++ b/nci/jni/NfcJniUtil.cpp
@@ -37,7 +37,7 @@
*******************************************************************************/
jint JNI_OnLoad (JavaVM* jvm, void*)
{
- ALOGD ("%s: enter", __func__);
+ ALOGV("%s: enter", __func__);
JNIEnv *e = NULL;
ALOGI("NFC Service: loading nci JNI");
@@ -60,7 +60,7 @@
return JNI_ERR;
if (RoutingManager::getInstance().registerJniFunctions (e) == -1)
return JNI_ERR;
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
return JNI_VERSION_1_6;
}
@@ -158,7 +158,7 @@
ScopedLocalRef<jclass> cls(e, e->FindClass(className));
if(cls.get() == NULL)
{
- ALOGE ("%s: find class error", __func__);
+ ALOGE("%s: find class error", __func__);
return -1;
}
@@ -166,14 +166,14 @@
jobject obj = e->NewObject(cls.get(), ctor);
if (obj == NULL)
{
- ALOGE ("%s: create object error", __func__);
+ ALOGE("%s: create object error", __func__);
return -1;
}
*cachedObj = obj;
if (*cachedObj == NULL)
{
- ALOGE ("%s: global ref error", __func__);
+ ALOGE("%s: global ref error", __func__);
return -1;
}
return 0;
diff --git a/nci/jni/NfcTag.cpp b/nci/jni/NfcTag.cpp
index d4447fa..3246f6f 100755
--- a/nci/jni/NfcTag.cpp
+++ b/nci/jni/NfcTag.cpp
@@ -155,7 +155,7 @@
mNdefDetectionTimedOut = false;
if (deactivated.type == NFA_DEACTIVATE_TYPE_SLEEP)
mActivationState = Sleep;
- ALOGD ("%s: state=%u", fn, mActivationState);
+ ALOGV("%s: state=%u", fn, mActivationState);
}
@@ -173,7 +173,7 @@
static const char fn [] = "NfcTag::setActivationState";
mNdefDetectionTimedOut = false;
mActivationState = Active;
- ALOGD ("%s: state=%u", fn, mActivationState);
+ ALOGV("%s: state=%u", fn, mActivationState);
}
/*******************************************************************************
@@ -247,7 +247,7 @@
bool NfcTag::IsSameKovio(tNFA_ACTIVATED& activationData)
{
static const char fn [] = "NfcTag::IsSameKovio";
- ALOGD ("%s: enter", fn);
+ ALOGV("%s: enter", fn);
tNFC_ACTIVATE_DEVT& rfDetail = activationData.activate_ntf;
if (rfDetail.protocol != NFC_PROTOCOL_KOVIO)
@@ -282,7 +282,7 @@
memcpy(mLastKovioUid, mTechParams[0].param.pk.uid, mLastKovioUidLen);
}
mLastKovioTime = now;
- ALOGD ("%s: exit, is same Kovio=%d", fn, rVal);
+ ALOGV("%s: exit, is same Kovio=%d", fn, rVal);
return rVal;
}
@@ -300,7 +300,7 @@
void NfcTag::discoverTechnologies (tNFA_ACTIVATED& activationData)
{
static const char fn [] = "NfcTag::discoverTechnologies (activation)";
- ALOGD ("%s: enter", fn);
+ ALOGV("%s: enter", fn);
tNFC_ACTIVATE_DEVT& rfDetail = activationData.activate_ntf;
mNumTechList = 0;
@@ -391,12 +391,12 @@
}
else if (NFC_PROTOCOL_KOVIO == rfDetail.protocol)
{
- ALOGD ("%s: Kovio", fn);
+ ALOGV("%s: Kovio", fn);
mTechList [mNumTechList] = TARGET_TYPE_KOVIO_BARCODE;
}
else if (NFC_PROTOCOL_MIFARE == rfDetail.protocol)
{
- ALOGD ("%s: Mifare Classic", fn);
+ ALOGV("%s: Mifare Classic", fn);
EXTNS_MfcInit (activationData);
mTechList [mNumTechList] = TARGET_TYPE_ISO14443_3A; //is TagTechnology.NFC_A by Java API
mNumTechList++;
@@ -408,17 +408,17 @@
}
else
{
- ALOGE ("%s: unknown protocol ????", fn);
+ ALOGE("%s: unknown protocol ????", fn);
mTechList [mNumTechList] = TARGET_TYPE_UNKNOWN;
}
mNumTechList++;
for (int i=0; i < mNumTechList; i++)
{
- ALOGD ("%s: index=%d; tech=%d; handle=%d; nfc type=%d", fn,
+ ALOGV("%s: index=%d; tech=%d; handle=%d; nfc type=%d", fn,
i, mTechList[i], mTechHandles[i], mTechLibNfcTypes[i]);
}
- ALOGD ("%s: exit", fn);
+ ALOGV("%s: exit", fn);
}
@@ -438,10 +438,10 @@
static const char fn [] = "NfcTag::discoverTechnologies (discovery)";
tNFC_RESULT_DEVT& discovery_ntf = discoveryData.discovery_ntf;
- ALOGD ("%s: enter: rf disc. id=%u; protocol=%u, mNumTechList=%u", fn, discovery_ntf.rf_disc_id, discovery_ntf.protocol, mNumTechList);
+ ALOGV("%s: enter: rf disc. id=%u; protocol=%u, mNumTechList=%u", fn, discovery_ntf.rf_disc_id, discovery_ntf.protocol, mNumTechList);
if (mNumTechList >= MAX_NUM_TECHNOLOGY)
{
- ALOGE ("%s: exceed max=%d", fn, MAX_NUM_TECHNOLOGY);
+ ALOGE("%s: exceed max=%d", fn, MAX_NUM_TECHNOLOGY);
goto TheEnd;
}
mTechHandles [mNumTechList] = discovery_ntf.rf_disc_id;
@@ -530,7 +530,7 @@
}
else
{
- ALOGE ("%s: unknown protocol ????", fn);
+ ALOGE("%s: unknown protocol ????", fn);
mTechList [mNumTechList] = TARGET_TYPE_UNKNOWN;
}
@@ -539,13 +539,13 @@
{
for (int i=0; i < mNumTechList; i++)
{
- ALOGD ("%s: index=%d; tech=%d; handle=%d; nfc type=%d", fn,
+ ALOGV("%s: index=%d; tech=%d; handle=%d; nfc type=%d", fn,
i, mTechList[i], mTechHandles[i], mTechLibNfcTypes[i]);
}
}
TheEnd:
- ALOGD ("%s: exit", fn);
+ ALOGV("%s: exit", fn);
}
@@ -564,7 +564,7 @@
void NfcTag::createNativeNfcTag (tNFA_ACTIVATED& activationData)
{
static const char fn [] = "NfcTag::createNativeNfcTag";
- ALOGD ("%s: enter", fn);
+ ALOGV("%s: enter", fn);
JNIEnv* e = NULL;
ScopedAttach attach(mNativeData->vm, &e);
@@ -608,15 +608,15 @@
mNativeData->tag = e->NewGlobalRef(tag.get());
//notify NFC service about this new tag
- ALOGD ("%s: try notify nfc service", fn);
+ ALOGV("%s: try notify nfc service", fn);
e->CallVoidMethod(mNativeData->manager, android::gCachedNfcManagerNotifyNdefMessageListeners, tag.get());
if (e->ExceptionCheck())
{
e->ExceptionClear();
- ALOGE ("%s: fail notify nfc service", fn);
+ ALOGE("%s: fail notify nfc service", fn);
}
- ALOGD ("%s: exit", fn);
+ ALOGV("%s: exit", fn);
}
@@ -635,7 +635,7 @@
void NfcTag::fillNativeNfcTagMembers1 (JNIEnv* e, jclass tag_cls, jobject tag)
{
static const char fn [] = "NfcTag::fillNativeNfcTagMembers1";
- ALOGD ("%s", fn);
+ ALOGV("%s", fn);
//create objects that represent NativeNfcTag's member variables
ScopedLocalRef<jintArray> techList(e, e->NewIntArray(mNumTechList));
@@ -686,7 +686,7 @@
void NfcTag::fillNativeNfcTagMembers2 (JNIEnv* e, jclass tag_cls, jobject tag, tNFA_ACTIVATED& /*activationData*/)
{
static const char fn [] = "NfcTag::fillNativeNfcTagMembers2";
- ALOGD ("%s", fn);
+ ALOGV("%s", fn);
jfieldID f = e->GetFieldID(tag_cls, "mConnectedTechIndex", "I");
e->SetIntField(tag, f, (jint) 0);
}
@@ -717,13 +717,13 @@
for (int i = 0; i < mNumTechList; i++)
{
- ALOGD ("%s: index=%d; rf tech params mode=%u", fn, i, mTechParams [i].mode);
+ ALOGV("%s: index=%d; rf tech params mode=%u", fn, i, mTechParams [i].mode);
if (NFC_DISCOVERY_TYPE_POLL_A == mTechParams [i].mode
|| NFC_DISCOVERY_TYPE_POLL_A_ACTIVE == mTechParams [i].mode
|| NFC_DISCOVERY_TYPE_LISTEN_A == mTechParams [i].mode
|| NFC_DISCOVERY_TYPE_LISTEN_A_ACTIVE == mTechParams [i].mode)
{
- ALOGD ("%s: tech A", fn);
+ ALOGV("%s: tech A", fn);
pollBytes.reset(e->NewByteArray(2));
e->SetByteArrayRegion(pollBytes.get(), 0, 2, (jbyte*) mTechParams [i].param.pa.sens_res);
}
@@ -739,7 +739,7 @@
in SENSB_RES response, byte 6 through 9 is Application Data, byte 10-12 or 13 is Protocol Info;
used by public API: NfcB.getApplicationData(), NfcB.getProtocolInfo();
*****************/
- ALOGD ("%s: tech B; TARGET_TYPE_ISO14443_3B", fn);
+ ALOGV("%s: tech B; TARGET_TYPE_ISO14443_3B", fn);
len = mTechParams [i].param.pb.sensb_res_len;
len = len - 4; //subtract 4 bytes for NFCID0 at byte 2 through 5
pollBytes.reset(e->NewByteArray(len));
@@ -761,7 +761,7 @@
PMm: manufacture parameter; 8 bytes;
System Code: 2 bytes;
****************/
- ALOGD ("%s: tech F", fn);
+ ALOGV("%s: tech F", fn);
uint8_t result [10]; //return result to NFC service
memset (result, 0, sizeof(result));
len = 10;
@@ -769,7 +769,7 @@
/****
for (int ii = 0; ii < mTechParams [i].param.pf.sensf_res_len; ii++)
{
- ALOGD ("%s: tech F, sendf_res[%d]=%d (0x%x)",
+ ALOGV("%s: tech F, sendf_res[%d]=%d (0x%x)",
fn, ii, mTechParams [i].param.pf.sensf_res[ii],mTechParams [i].param.pf.sensf_res[ii]);
}
***/
@@ -779,7 +779,7 @@
uint16_t systemCode = *(activationData.params.t3t.p_system_codes);
result [8] = (uint8_t) (systemCode >> 8);
result [9] = (uint8_t) systemCode;
- ALOGD ("%s: tech F; sys code=0x%X 0x%X", fn, result [8], result [9]);
+ ALOGV("%s: tech F; sys code=0x%X 0x%X", fn, result [8], result [9]);
}
pollBytes.reset(e->NewByteArray(len));
e->SetByteArrayRegion(pollBytes.get(), 0, len, (jbyte*) result);
@@ -787,7 +787,7 @@
else if (NFC_DISCOVERY_TYPE_POLL_ISO15693 == mTechParams [i].mode
|| NFC_DISCOVERY_TYPE_LISTEN_ISO15693 == mTechParams [i].mode)
{
- ALOGD ("%s: tech iso 15693", fn);
+ ALOGV("%s: tech iso 15693", fn);
//iso 15693 response flags: 1 octet
//iso 15693 Data Structure Format Identifier (DSF ID): 1 octet
//used by public API: NfcV.getDsfId(), NfcV.getResponseFlags();
@@ -797,7 +797,7 @@
}
else
{
- ALOGE ("%s: tech unknown ????", fn);
+ ALOGE("%s: tech unknown ????", fn);
pollBytes.reset(e->NewByteArray(0));
} //switch: every type of technology
e->SetObjectArrayElement(techPollBytes.get(), i, pollBytes.get());
@@ -831,26 +831,26 @@
for (int i = 0; i < mNumTechList; i++)
{
- ALOGD ("%s: index=%d", fn, i);
+ ALOGV("%s: index=%d", fn, i);
if (NFC_PROTOCOL_T1T == mTechLibNfcTypes[i] || NFC_PROTOCOL_T2T == mTechLibNfcTypes[i])
{
if (mTechLibNfcTypes[i] == NFC_PROTOCOL_T1T)
- ALOGD ("%s: T1T; tech A", fn);
+ ALOGV("%s: T1T; tech A", fn);
else if (mTechLibNfcTypes[i] == NFC_PROTOCOL_T2T)
- ALOGD ("%s: T2T; tech A", fn);
+ ALOGV("%s: T2T; tech A", fn);
actBytes.reset(e->NewByteArray(1));
e->SetByteArrayRegion(actBytes.get(), 0, 1, (jbyte*) &mTechParams [i].param.pa.sel_rsp);
}
else if (NFC_PROTOCOL_T3T == mTechLibNfcTypes[i])
{
//felica
- ALOGD ("%s: T3T; felica; tech F", fn);
+ ALOGV("%s: T3T; felica; tech F", fn);
//really, there is no data
actBytes.reset(e->NewByteArray(0));
}
else if (NFC_PROTOCOL_MIFARE == mTechLibNfcTypes[i])
{
- ALOGD ("%s: Mifare Classic; tech A", fn);
+ ALOGV("%s: Mifare Classic; tech A", fn);
actBytes.reset (e->NewByteArray(1));
e->SetByteArrayRegion (actBytes.get(), 0, 1,
(jbyte*) &mTechParams [i].param.pa.sel_rsp);
@@ -871,14 +871,14 @@
if (activationData.activate_ntf.intf_param.type == NFC_INTERFACE_ISO_DEP)
{
tNFC_INTF_PA_ISO_DEP& pa_iso = activationData.activate_ntf.intf_param.intf_param.pa_iso;
- ALOGD ("%s: T4T; ISO_DEP for tech A; copy historical bytes; len=%u", fn, pa_iso.his_byte_len);
+ ALOGV("%s: T4T; ISO_DEP for tech A; copy historical bytes; len=%u", fn, pa_iso.his_byte_len);
actBytes.reset(e->NewByteArray(pa_iso.his_byte_len));
if (pa_iso.his_byte_len > 0)
e->SetByteArrayRegion(actBytes.get(), 0, pa_iso.his_byte_len, (jbyte*) (pa_iso.his_byte));
}
else
{
- ALOGE ("%s: T4T; ISO_DEP for tech A; wrong interface=%u", fn, activationData.activate_ntf.intf_param.type);
+ ALOGE("%s: T4T; ISO_DEP for tech A; wrong interface=%u", fn, activationData.activate_ntf.intf_param.type);
actBytes.reset(e->NewByteArray(0));
}
}
@@ -893,21 +893,21 @@
if (activationData.activate_ntf.intf_param.type == NFC_INTERFACE_ISO_DEP)
{
tNFC_INTF_PB_ISO_DEP& pb_iso = activationData.activate_ntf.intf_param.intf_param.pb_iso;
- ALOGD ("%s: T4T; ISO_DEP for tech B; copy response bytes; len=%u", fn, pb_iso.hi_info_len);
+ ALOGV("%s: T4T; ISO_DEP for tech B; copy response bytes; len=%u", fn, pb_iso.hi_info_len);
actBytes.reset(e->NewByteArray(pb_iso.hi_info_len));
if (pb_iso.hi_info_len > 0)
e->SetByteArrayRegion(actBytes.get(), 0, pb_iso.hi_info_len, (jbyte*) (pb_iso.hi_info));
}
else
{
- ALOGE ("%s: T4T; ISO_DEP for tech B; wrong interface=%u", fn, activationData.activate_ntf.intf_param.type);
+ ALOGE("%s: T4T; ISO_DEP for tech B; wrong interface=%u", fn, activationData.activate_ntf.intf_param.type);
actBytes.reset(e->NewByteArray(0));
}
}
}
else if (mTechList [i] == TARGET_TYPE_ISO14443_3A) //is TagTechnology.NFC_A by Java API
{
- ALOGD ("%s: T4T; tech A", fn);
+ ALOGV("%s: T4T; tech A", fn);
actBytes.reset(e->NewByteArray(1));
e->SetByteArrayRegion(actBytes.get(), 0, 1, (jbyte*) &mTechParams [i].param.pa.sel_rsp);
}
@@ -918,7 +918,7 @@
} //case NFC_PROTOCOL_ISO_DEP: //t4t
else if (NFC_PROTOCOL_15693 == mTechLibNfcTypes[i])
{
- ALOGD ("%s: tech iso 15693", fn);
+ ALOGV("%s: tech iso 15693", fn);
//iso 15693 response flags: 1 octet
//iso 15693 Data Structure Format Identifier (DSF ID): 1 octet
//used by public API: NfcV.getDsfId(), NfcV.getResponseFlags();
@@ -928,7 +928,7 @@
}
else
{
- ALOGD ("%s: tech unknown ????", fn);
+ ALOGV("%s: tech unknown ????", fn);
actBytes.reset(e->NewByteArray(0));
}
e->SetObjectArrayElement(techActBytes.get(), i, actBytes.get());
@@ -961,7 +961,7 @@
if (NFC_DISCOVERY_TYPE_POLL_KOVIO == mTechParams [0].mode)
{
- ALOGD ("%s: Kovio", fn);
+ ALOGV("%s: Kovio", fn);
len = mTechParams [0].param.pk.uid_len;
uid.reset(e->NewByteArray(len));
e->SetByteArrayRegion(uid.get(), 0, len,
@@ -972,7 +972,7 @@
|| NFC_DISCOVERY_TYPE_LISTEN_A == mTechParams [0].mode
|| NFC_DISCOVERY_TYPE_LISTEN_A_ACTIVE == mTechParams [0].mode)
{
- ALOGD ("%s: tech A", fn);
+ ALOGV("%s: tech A", fn);
len = mTechParams [0].param.pa.nfcid1_len;
uid.reset(e->NewByteArray(len));
e->SetByteArrayRegion(uid.get(), 0, len,
@@ -989,7 +989,7 @@
|| NFC_DISCOVERY_TYPE_LISTEN_B == mTechParams [0].mode
|| NFC_DISCOVERY_TYPE_LISTEN_B_PRIME == mTechParams [0].mode)
{
- ALOGD ("%s: tech B", fn);
+ ALOGV("%s: tech B", fn);
uid.reset(e->NewByteArray(NFC_NFCID0_MAX_LEN));
e->SetByteArrayRegion(uid.get(), 0, NFC_NFCID0_MAX_LEN,
(jbyte*) &mTechParams [0].param.pb.nfcid0);
@@ -1002,12 +1002,12 @@
uid.reset(e->NewByteArray(NFC_NFCID2_LEN));
e->SetByteArrayRegion(uid.get(), 0, NFC_NFCID2_LEN,
(jbyte*) &mTechParams [0].param.pf.nfcid2);
- ALOGD ("%s: tech F", fn);
+ ALOGV("%s: tech F", fn);
}
else if (NFC_DISCOVERY_TYPE_POLL_ISO15693 == mTechParams [0].mode
|| NFC_DISCOVERY_TYPE_LISTEN_ISO15693 == mTechParams [0].mode)
{
- ALOGD ("%s: tech iso 15693", fn);
+ ALOGV("%s: tech iso 15693", fn);
jbyte data [I93_UID_BYTE_LEN]; //8 bytes
for (int i=0; i<I93_UID_BYTE_LEN; ++i) //reverse the ID
data[i] = activationData.params.i93.uid [I93_UID_BYTE_LEN - i - 1];
@@ -1016,7 +1016,7 @@
}
else
{
- ALOGE ("%s: tech unknown ????", fn);
+ ALOGE("%s: tech unknown ????", fn);
uid.reset(e->NewByteArray(0));
}
jfieldID f = e->GetFieldID(tag_cls, "mUid", "[B");
@@ -1043,12 +1043,12 @@
if (mTechLibNfcTypes[i] == NFA_PROTOCOL_NFC_DEP)
{
//if remote device supports P2P
- ALOGD ("%s: discovered P2P", fn);
+ ALOGV("%s: discovered P2P", fn);
retval = true;
break;
}
}
- ALOGD ("%s: return=%u", fn, retval);
+ ALOGV("%s: return=%u", fn, retval);
return retval;
}
@@ -1092,13 +1092,13 @@
if (rfDiscoveryId > 0)
{
- ALOGD ("%s: select P2P; target rf discov id=0x%X", fn, rfDiscoveryId);
+ ALOGV("%s: select P2P; target rf discov id=0x%X", fn, rfDiscoveryId);
tNFA_STATUS stat = NFA_Select (rfDiscoveryId, NFA_PROTOCOL_NFC_DEP, NFA_INTERFACE_NFC_DEP);
if (stat != NFA_STATUS_OK)
- ALOGE ("%s: fail select P2P; error=0x%X", fn, stat);
+ ALOGE("%s: fail select P2P; error=0x%X", fn, stat);
}
else
- ALOGE ("%s: cannot find P2P", fn);
+ ALOGE("%s: cannot find P2P", fn);
resetTechnologies ();
}
@@ -1115,7 +1115,7 @@
void NfcTag::resetTechnologies ()
{
static const char fn [] = "NfcTag::resetTechnologies";
- ALOGD ("%s", fn);
+ ALOGV("%s", fn);
mNumTechList = 0;
memset (mTechList, 0, sizeof(mTechList));
memset (mTechHandles, 0, sizeof(mTechHandles));
@@ -1144,7 +1144,7 @@
for (int i = 0; i < mNumTechList; i++)
{
- ALOGD ("%s: nfa target idx=%d h=0x%X; protocol=0x%X",
+ ALOGV("%s: nfa target idx=%d h=0x%X; protocol=0x%X",
fn, i, mTechHandles [i], mTechLibNfcTypes [i]);
if (mTechLibNfcTypes[i] != NFA_PROTOCOL_NFC_DEP)
{
@@ -1168,10 +1168,10 @@
tNFA_STATUS stat = NFA_Select (mTechHandles [foundIdx], mTechLibNfcTypes [foundIdx], rf_intf);
if (stat != NFA_STATUS_OK)
- ALOGE ("%s: fail select; error=0x%X", fn, stat);
+ ALOGE("%s: fail select; error=0x%X", fn, stat);
}
else
- ALOGE ("%s: only found NFC-DEP technology.", fn);
+ ALOGE("%s: only found NFC-DEP technology.", fn);
}
@@ -1190,7 +1190,7 @@
if (mProtocol != NFC_PROTOCOL_T1T)
{
- ALOGE ("%s: wrong protocol %u", fn, mProtocol);
+ ALOGE("%s: wrong protocol %u", fn, mProtocol);
return 0;
}
return mtT1tMaxMessageSize;
@@ -1228,7 +1228,7 @@
mtT1tMaxMessageSize = 462;
break;
default:
- ALOGE ("%s: unknown T1T HR0=%u", fn, activate.params.t1t.hr[0]);
+ ALOGE("%s: unknown T1T HR0=%u", fn, activate.params.t1t.hr[0]);
mtT1tMaxMessageSize = 0;
break;
}
@@ -1266,7 +1266,7 @@
break;
}
}
- ALOGD ("%s: return=%u", fn, retval);
+ ALOGV("%s: return=%u", fn, retval);
return retval;
}
@@ -1302,7 +1302,7 @@
}
}
- ALOGD ("%s: return=%u", fn, retval);
+ ALOGV("%s: return=%u", fn, retval);
return retval;
}
@@ -1348,7 +1348,7 @@
else
isNack = true; //assume every value is a NACK
}
- ALOGD ("%s: return %u", fn, isNack);
+ ALOGV("%s: return %u", fn, isNack);
return isNack;
}
@@ -1424,7 +1424,7 @@
mReadCompletedStatus = data->status;
mNdefDetectionTimedOut = data->status != NFA_STATUS_OK;
if (mNdefDetectionTimedOut)
- ALOGE ("%s: NDEF detection timed out", fn);
+ ALOGE("%s: NDEF detection timed out", fn);
mReadCompleteEvent.notifyOne ();
}
break;
@@ -1434,7 +1434,7 @@
tNFA_NDEF_DETECT& ndef_detect = data->ndef_detect;
mNdefDetectionTimedOut = ndef_detect.status == NFA_STATUS_TIMEOUT;
if (mNdefDetectionTimedOut)
- ALOGE ("%s: NDEF detection timed out", fn);
+ ALOGE("%s: NDEF detection timed out", fn);
}
}
}
@@ -1512,7 +1512,7 @@
if ((techId > 0) && (techId < (int) mTechnologyTimeoutsTable.size()))
retval = mTechnologyTimeoutsTable [techId];
else
- ALOGE ("%s: invalid tech=%d", fn, techId);
+ ALOGE("%s: invalid tech=%d", fn, techId);
return retval;
}
@@ -1534,7 +1534,7 @@
if ((techId >= 0) && (techId < (int) mTechnologyTimeoutsTable.size()))
mTechnologyTimeoutsTable [techId] = timeout;
else
- ALOGE ("%s: invalid tech=%d", fn, techId);
+ ALOGE("%s: invalid tech=%d", fn, techId);
}
@@ -1582,7 +1582,7 @@
break;
}
}
- ALOGD ("%s: return=%u", fn, retval);
+ ALOGV("%s: return=%u", fn, retval);
return retval;
}
@@ -1612,6 +1612,6 @@
break;
}
}
- ALOGD ("%s: return=%u", fn, retval);
+ ALOGV("%s: return=%u", fn, retval);
return retval;
}
diff --git a/nci/jni/PeerToPeer.cpp b/nci/jni/PeerToPeer.cpp
index e2a88b4..5c145ba 100644
--- a/nci/jni/PeerToPeer.cpp
+++ b/nci/jni/PeerToPeer.cpp
@@ -112,7 +112,7 @@
*******************************************************************************/
void PeerToPeer::initialize ()
{
- ALOGD ("PeerToPeer::initialize");
+ ALOGV("PeerToPeer::initialize");
unsigned long num = 0;
if (GetNumValue ("P2P_LISTEN_TECH_MASK", &num, sizeof (num)))
@@ -212,14 +212,14 @@
bool PeerToPeer::registerServer (tJNI_HANDLE jniHandle, const char *serviceName)
{
static const char fn [] = "PeerToPeer::registerServer";
- ALOGD ("%s: enter; service name: %s JNI handle: %u", fn, serviceName, jniHandle);
+ ALOGV("%s: enter; service name: %s JNI handle: %u", fn, serviceName, jniHandle);
sp<P2pServer> pSrv = NULL;
mMutex.lock();
// Check if already registered
if ((pSrv = findServerLocked(serviceName)) != NULL)
{
- ALOGD ("%s: service name=%s already registered, handle: 0x%04x", fn, serviceName, pSrv->mNfaP2pServerHandle);
+ ALOGV("%s: service name=%s already registered, handle: 0x%04x", fn, serviceName, pSrv->mNfaP2pServerHandle);
// Update JNI handle
pSrv->mJniHandle = jniHandle;
@@ -233,7 +233,7 @@
{
pSrv = mServers[ii] = new P2pServer(jniHandle, serviceName);
- ALOGD ("%s: added new p2p server index: %d handle: %u name: %s", fn, ii, jniHandle, serviceName);
+ ALOGV("%s: added new p2p server index: %d handle: %u name: %s", fn, ii, jniHandle, serviceName);
break;
}
}
@@ -241,15 +241,15 @@
if (pSrv == NULL)
{
- ALOGE ("%s: service name=%s no free entry", fn, serviceName);
+ ALOGE("%s: service name=%s no free entry", fn, serviceName);
return (false);
}
if (pSrv->registerWithStack()) {
- ALOGD ("%s: got new p2p server h=0x%X", fn, pSrv->mNfaP2pServerHandle);
+ ALOGV("%s: got new p2p server h=0x%X", fn, pSrv->mNfaP2pServerHandle);
return (true);
} else {
- ALOGE ("%s: invalid server handle", fn);
+ ALOGE("%s: invalid server handle", fn);
removeServer (jniHandle);
return (false);
}
@@ -276,14 +276,14 @@
{
if ( (mServers[i] != NULL) && (mServers[i]->mJniHandle == jniHandle) )
{
- ALOGD ("%s: server jni_handle: %u; nfa_handle: 0x%04x; name: %s; index=%d",
+ ALOGV("%s: server jni_handle: %u; nfa_handle: 0x%04x; name: %s; index=%d",
fn, jniHandle, mServers[i]->mNfaP2pServerHandle, mServers[i]->mServiceName.c_str(), i);
mServers [i] = NULL;
return;
}
}
- ALOGE ("%s: unknown server jni handle: %u", fn, jniHandle);
+ ALOGE("%s: unknown server jni handle: %u", fn, jniHandle);
}
@@ -301,7 +301,7 @@
void PeerToPeer::llcpActivatedHandler (nfc_jni_native_data* nat, tNFA_LLCP_ACTIVATED& activated)
{
static const char fn [] = "PeerToPeer::llcpActivatedHandler";
- ALOGD ("%s: enter", fn);
+ ALOGV("%s: enter", fn);
//no longer need to receive NDEF message from a tag
android::nativeNfcTag_deregisterNdefTypeHandler ();
@@ -312,19 +312,19 @@
ScopedAttach attach(nat->vm, &e);
if (e == NULL)
{
- ALOGE ("%s: jni env is null", fn);
+ ALOGE("%s: jni env is null", fn);
return;
}
- ALOGD ("%s: get object class", fn);
+ ALOGV("%s: get object class", fn);
ScopedLocalRef<jclass> tag_cls(e, e->GetObjectClass(nat->cached_P2pDevice));
if (e->ExceptionCheck()) {
e->ExceptionClear();
- ALOGE ("%s: fail get p2p device", fn);
+ ALOGE("%s: fail get p2p device", fn);
return;
}
- ALOGD ("%s: instantiate", fn);
+ ALOGV("%s: instantiate", fn);
/* New target instance */
jmethodID ctor = e->GetMethodID(tag_cls.get(), "<init>", "()V");
ScopedLocalRef<jobject> tag(e, e->NewObject(tag_cls.get(), ctor));
@@ -333,10 +333,10 @@
jfieldID f = e->GetFieldID(tag_cls.get(), "mMode", "I");
if (activated.is_initiator == TRUE) {
- ALOGD ("%s: p2p initiator", fn);
+ ALOGV("%s: p2p initiator", fn);
e->SetIntField(tag.get(), f, (jint) MODE_P2P_INITIATOR);
} else {
- ALOGD ("%s: p2p target", fn);
+ ALOGV("%s: p2p target", fn);
e->SetIntField(tag.get(), f, (jint) MODE_P2P_TARGET);
}
/* Set LLCP version */
@@ -352,16 +352,16 @@
}
nat->tag = e->NewGlobalRef(tag.get());
- ALOGD ("%s: notify nfc service", fn);
+ ALOGV("%s: notify nfc service", fn);
/* Notify manager that new a P2P device was found */
e->CallVoidMethod(nat->manager, android::gCachedNfcManagerNotifyLlcpLinkActivation, tag.get());
if (e->ExceptionCheck()) {
e->ExceptionClear();
- ALOGE ("%s: fail notify", fn);
+ ALOGE("%s: fail notify", fn);
}
- ALOGD ("%s: exit", fn);
+ ALOGV("%s: exit", fn);
}
@@ -379,53 +379,53 @@
void PeerToPeer::llcpDeactivatedHandler (nfc_jni_native_data* nat, tNFA_LLCP_DEACTIVATED& /*deactivated*/)
{
static const char fn [] = "PeerToPeer::llcpDeactivatedHandler";
- ALOGD ("%s: enter", fn);
+ ALOGV("%s: enter", fn);
JNIEnv* e = NULL;
ScopedAttach attach(nat->vm, &e);
if (e == NULL)
{
- ALOGE ("%s: jni env is null", fn);
+ ALOGE("%s: jni env is null", fn);
return;
}
- ALOGD ("%s: notify nfc service", fn);
+ ALOGV("%s: notify nfc service", fn);
/* Notify manager that the LLCP is lost or deactivated */
e->CallVoidMethod (nat->manager, android::gCachedNfcManagerNotifyLlcpLinkDeactivated, nat->tag);
if (e->ExceptionCheck())
{
e->ExceptionClear();
- ALOGE ("%s: fail notify", fn);
+ ALOGE("%s: fail notify", fn);
}
//let the tag-reading code handle NDEF data event
android::nativeNfcTag_registerNdefTypeHandler ();
- ALOGD ("%s: exit", fn);
+ ALOGV("%s: exit", fn);
}
void PeerToPeer::llcpFirstPacketHandler (nfc_jni_native_data* nat)
{
static const char fn [] = "PeerToPeer::llcpFirstPacketHandler";
- ALOGD ("%s: enter", fn);
+ ALOGV("%s: enter", fn);
JNIEnv* e = NULL;
ScopedAttach attach(nat->vm, &e);
if (e == NULL)
{
- ALOGE ("%s: jni env is null", fn);
+ ALOGE("%s: jni env is null", fn);
return;
}
- ALOGD ("%s: notify nfc service", fn);
+ ALOGV("%s: notify nfc service", fn);
/* Notify manager that the LLCP is lost or deactivated */
e->CallVoidMethod (nat->manager, android::gCachedNfcManagerNotifyLlcpFirstPacketReceived, nat->tag);
if (e->ExceptionCheck())
{
e->ExceptionClear();
- ALOGE ("%s: fail notify", fn);
+ ALOGE("%s: fail notify", fn);
}
- ALOGD ("%s: exit", fn);
+ ALOGV("%s: exit", fn);
}
/*******************************************************************************
@@ -446,13 +446,13 @@
static const char fn [] = "PeerToPeer::accept";
sp<P2pServer> pSrv = NULL;
- ALOGD ("%s: enter; server jni handle: %u; conn jni handle: %u; maxInfoUnit: %d; recvWindow: %d", fn,
+ ALOGV("%s: enter; server jni handle: %u; conn jni handle: %u; maxInfoUnit: %d; recvWindow: %d", fn,
serverJniHandle, connJniHandle, maxInfoUnit, recvWindow);
mMutex.lock();
if ((pSrv = findServerLocked (serverJniHandle)) == NULL)
{
- ALOGE ("%s: unknown server jni handle: %u", fn, serverJniHandle);
+ ALOGE("%s: unknown server jni handle: %u", fn, serverJniHandle);
mMutex.unlock();
return (false);
}
@@ -474,7 +474,7 @@
bool PeerToPeer::deregisterServer (tJNI_HANDLE jniHandle)
{
static const char fn [] = "PeerToPeer::deregisterServer";
- ALOGD ("%s: enter; JNI handle: %u", fn, jniHandle);
+ ALOGV("%s: enter; JNI handle: %u", fn, jniHandle);
tNFA_STATUS nfaStat = NFA_STATUS_FAILED;
sp<P2pServer> pSrv = NULL;
bool isPollingTempStopped = false;
@@ -482,7 +482,7 @@
mMutex.lock();
if ((pSrv = findServerLocked (jniHandle)) == NULL)
{
- ALOGE ("%s: unknown service handle: %u", fn, jniHandle);
+ ALOGE("%s: unknown service handle: %u", fn, jniHandle);
mMutex.unlock();
return (false);
}
@@ -502,7 +502,7 @@
nfaStat = NFA_P2pDeregister (pSrv->mNfaP2pServerHandle);
if (nfaStat != NFA_STATUS_OK)
{
- ALOGE ("%s: deregister error=0x%X", fn, nfaStat);
+ ALOGE("%s: deregister error=0x%X", fn, nfaStat);
}
removeServer (jniHandle);
@@ -512,7 +512,7 @@
startRfDiscovery (true);
}
- ALOGD ("%s: exit", fn);
+ ALOGV("%s: exit", fn);
return true;
}
@@ -533,7 +533,7 @@
{
static const char fn [] = "PeerToPeer::createClient";
int i = 0;
- ALOGD ("%s: enter: jni h: %u miu: %u rw: %u", fn, jniHandle, miu, rw);
+ ALOGV("%s: enter: jni h: %u miu: %u rw: %u", fn, jniHandle, miu, rw);
mMutex.lock();
sp<P2pClient> client = NULL;
@@ -553,11 +553,11 @@
if (client == NULL)
{
- ALOGE ("%s: fail", fn);
+ ALOGE("%s: fail", fn);
return (false);
}
- ALOGD ("%s: pClient: 0x%p assigned for client jniHandle: %u", fn, client.get(), jniHandle);
+ ALOGV("%s: pClient: 0x%p assigned for client jniHandle: %u", fn, client.get(), jniHandle);
{
SyncEventGuard guard (mClients[i]->mRegisteringEvent);
@@ -567,12 +567,12 @@
if (mClients[i]->mNfaP2pClientHandle != NFA_HANDLE_INVALID)
{
- ALOGD ("%s: exit; new client jniHandle: %u NFA Handle: 0x%04x", fn, jniHandle, client->mClientConn->mNfaConnHandle);
+ ALOGV("%s: exit; new client jniHandle: %u NFA Handle: 0x%04x", fn, jniHandle, client->mClientConn->mNfaConnHandle);
return (true);
}
else
{
- ALOGE ("%s: FAILED; new client jniHandle: %u NFA Handle: 0x%04x", fn, jniHandle, client->mClientConn->mNfaConnHandle);
+ ALOGE("%s: FAILED; new client jniHandle: %u NFA Handle: 0x%04x", fn, jniHandle, client->mClientConn->mNfaConnHandle);
removeConn (jniHandle);
return (false);
}
@@ -603,7 +603,7 @@
NFA_P2pDeregister (mClients[ii]->mNfaP2pClientHandle);
mClients[ii] = NULL;
- ALOGD ("%s: deleted client handle: %u index: %u", fn, jniHandle, ii);
+ ALOGV("%s: deleted client handle: %u index: %u", fn, jniHandle, ii);
return;
}
}
@@ -619,7 +619,7 @@
}
}
- ALOGE ("%s: could not find handle: %u", fn, jniHandle);
+ ALOGE("%s: could not find handle: %u", fn, jniHandle);
}
@@ -637,9 +637,9 @@
bool PeerToPeer::connectConnOriented (tJNI_HANDLE jniHandle, const char* serviceName)
{
static const char fn [] = "PeerToPeer::connectConnOriented";
- ALOGD ("%s: enter; h: %u service name=%s", fn, jniHandle, serviceName);
+ ALOGV("%s: enter; h: %u service name=%s", fn, jniHandle, serviceName);
bool stat = createDataLinkConn (jniHandle, serviceName, 0);
- ALOGD ("%s: exit; h: %u stat: %u", fn, jniHandle, stat);
+ ALOGV("%s: exit; h: %u stat: %u", fn, jniHandle, stat);
return stat;
}
@@ -658,9 +658,9 @@
bool PeerToPeer::connectConnOriented (tJNI_HANDLE jniHandle, uint8_t destinationSap)
{
static const char fn [] = "PeerToPeer::connectConnOriented";
- ALOGD ("%s: enter; h: %u dest sap: 0x%X", fn, jniHandle, destinationSap);
+ ALOGV("%s: enter; h: %u dest sap: 0x%X", fn, jniHandle, destinationSap);
bool stat = createDataLinkConn (jniHandle, NULL, destinationSap);
- ALOGD ("%s: exit; h: %u stat: %u", fn, jniHandle, stat);
+ ALOGV("%s: exit; h: %u stat: %u", fn, jniHandle, stat);
return stat;
}
@@ -680,13 +680,13 @@
bool PeerToPeer::createDataLinkConn (tJNI_HANDLE jniHandle, const char* serviceName, uint8_t destinationSap)
{
static const char fn [] = "PeerToPeer::createDataLinkConn";
- ALOGD ("%s: enter", fn);
+ ALOGV("%s: enter", fn);
tNFA_STATUS nfaStat = NFA_STATUS_FAILED;
sp<P2pClient> pClient = NULL;
if ((pClient = findClient (jniHandle)) == NULL)
{
- ALOGE ("%s: can't find client, JNI handle: %u", fn, jniHandle);
+ ALOGE("%s: can't find client, JNI handle: %u", fn, jniHandle);
return (false);
}
@@ -703,7 +703,7 @@
pClient->mClientConn->mMaxInfoUnit, pClient->mClientConn->mRecvWindow);
if (nfaStat == NFA_STATUS_OK)
{
- ALOGD ("%s: wait for connected event mConnectingEvent: 0x%p", fn, pClient.get());
+ ALOGV("%s: wait for connected event mConnectingEvent: 0x%p", fn, pClient.get());
pClient->mConnectingEvent.wait();
}
}
@@ -721,10 +721,10 @@
else
{
removeConn (jniHandle);
- ALOGE ("%s: fail; error=0x%X", fn, nfaStat);
+ ALOGE("%s: fail; error=0x%X", fn, nfaStat);
}
- ALOGD ("%s: exit", fn);
+ ALOGV("%s: exit", fn);
return nfaStat == NFA_STATUS_OK;
}
@@ -893,11 +893,11 @@
if ((pConn = findConnection (jniHandle)) == NULL)
{
- ALOGE ("%s: can't find connection handle: %u", fn, jniHandle);
+ ALOGE("%s: can't find connection handle: %u", fn, jniHandle);
return (false);
}
- ALOGD_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: send data; jniHandle: %u nfaHandle: 0x%04X",
+ ALOGV_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: send data; jniHandle: %u nfaHandle: 0x%04X",
fn, pConn->mJniHandle, pConn->mNfaConnHandle);
while (true)
@@ -911,15 +911,15 @@
if (pConn->mNfaConnHandle == NFA_HANDLE_INVALID) //peer already disconnected
{
- ALOGD_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: peer disconnected", fn);
+ ALOGV_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: peer disconnected", fn);
return (false);
}
}
if (nfaStat == NFA_STATUS_OK)
- ALOGD_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: exit OK; JNI handle: %u NFA Handle: 0x%04x", fn, jniHandle, pConn->mNfaConnHandle);
+ ALOGV_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: exit OK; JNI handle: %u NFA Handle: 0x%04x", fn, jniHandle, pConn->mNfaConnHandle);
else
- ALOGE ("%s: Data not sent; JNI handle: %u NFA Handle: 0x%04x error: 0x%04x",
+ ALOGE("%s: Data not sent; JNI handle: %u NFA Handle: 0x%04x error: 0x%04x",
fn, jniHandle, pConn->mNfaConnHandle, nfaStat);
return nfaStat == NFA_STATUS_OK;
@@ -942,7 +942,7 @@
bool PeerToPeer::receive (tJNI_HANDLE jniHandle, uint8_t* buffer, uint16_t bufferLen, uint16_t& actualLen)
{
static const char fn [] = "PeerToPeer::receive";
- ALOGD_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: enter; jniHandle: %u bufferLen: %u", fn, jniHandle, bufferLen);
+ ALOGV_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: enter; jniHandle: %u bufferLen: %u", fn, jniHandle, bufferLen);
sp<NfaConn> pConn = NULL;
tNFA_STATUS stat = NFA_STATUS_FAILED;
uint32_t actualDataLen2 = 0;
@@ -951,11 +951,11 @@
if ((pConn = findConnection (jniHandle)) == NULL)
{
- ALOGE ("%s: can't find connection handle: %u", fn, jniHandle);
+ ALOGE("%s: can't find connection handle: %u", fn, jniHandle);
return (false);
}
- ALOGD_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: jniHandle: %u nfaHandle: 0x%04X buf len=%u", fn, pConn->mJniHandle, pConn->mNfaConnHandle, bufferLen);
+ ALOGV_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: jniHandle: %u nfaHandle: 0x%04X buf len=%u", fn, pConn->mJniHandle, pConn->mNfaConnHandle, bufferLen);
while (pConn->mNfaConnHandle != NFA_HANDLE_INVALID)
{
@@ -967,14 +967,14 @@
retVal = true;
break;
}
- ALOGD_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: waiting for data...", fn);
+ ALOGV_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: waiting for data...", fn);
{
SyncEventGuard guard (pConn->mReadEvent);
pConn->mReadEvent.wait();
}
} //while
- ALOGD_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: exit; nfa h: 0x%X ok: %u actual len: %u", fn, pConn->mNfaConnHandle, retVal, actualLen);
+ ALOGV_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: exit; nfa h: 0x%X ok: %u actual len: %u", fn, pConn->mNfaConnHandle, retVal, actualLen);
return retVal;
}
@@ -996,11 +996,11 @@
sp<P2pClient> pClient = NULL;
sp<NfaConn> pConn = NULL;
- ALOGD ("%s: enter; jni handle: %u", fn, jniHandle);
+ ALOGV("%s: enter; jni handle: %u", fn, jniHandle);
if ((pConn = findConnection(jniHandle)) == NULL)
{
- ALOGE ("%s: can't find connection handle: %u", fn, jniHandle);
+ ALOGE("%s: can't find connection handle: %u", fn, jniHandle);
return (false);
}
@@ -1023,12 +1023,12 @@
if (pConn->mNfaConnHandle != NFA_HANDLE_INVALID)
{
- ALOGD ("%s: try disconn nfa h=0x%04X", fn, pConn->mNfaConnHandle);
+ ALOGV("%s: try disconn nfa h=0x%04X", fn, pConn->mNfaConnHandle);
SyncEventGuard guard (pConn->mDisconnectingEvent);
nfaStat = NFA_P2pDisconnect (pConn->mNfaConnHandle, FALSE);
if (nfaStat != NFA_STATUS_OK)
- ALOGE ("%s: fail p2p disconnect", fn);
+ ALOGE("%s: fail p2p disconnect", fn);
else
pConn->mDisconnectingEvent.wait();
}
@@ -1037,7 +1037,7 @@
removeConn (jniHandle);
mDisconnectMutex.unlock ();
- ALOGD ("%s: exit; jni handle: %u", fn, jniHandle);
+ ALOGV("%s: exit; jni handle: %u", fn, jniHandle);
return nfaStat == NFA_STATUS_OK;
}
@@ -1059,10 +1059,10 @@
if ((pConn = findConnection(jniHandle)) == NULL)
{
- ALOGE ("%s: can't find client jniHandle: %u", fn, jniHandle);
+ ALOGE("%s: can't find client jniHandle: %u", fn, jniHandle);
return 0;
}
- ALOGD ("%s: jniHandle: %u MIU: %u", fn, jniHandle, pConn->mRemoteMaxInfoUnit);
+ ALOGV("%s: jniHandle: %u MIU: %u", fn, jniHandle, pConn->mRemoteMaxInfoUnit);
return (pConn->mRemoteMaxInfoUnit);
}
@@ -1080,12 +1080,12 @@
uint8_t PeerToPeer::getRemoteRecvWindow (tJNI_HANDLE jniHandle)
{
static const char fn [] = "PeerToPeer::getRemoteRecvWindow";
- ALOGD ("%s: client jni handle: %u", fn, jniHandle);
+ ALOGV("%s: client jni handle: %u", fn, jniHandle);
sp<NfaConn> pConn = NULL;
if ((pConn = findConnection(jniHandle)) == NULL)
{
- ALOGE ("%s: can't find client", fn);
+ ALOGE("%s: can't find client", fn);
return 0;
}
return pConn->mRemoteRecvWindow;
@@ -1157,7 +1157,7 @@
static const char fn [] = "PeerToPeer::enableP2pListening";
tNFA_STATUS nfaStat = NFA_STATUS_FAILED;
- ALOGD ("%s: enter isEnable: %u mIsP2pListening: %u", fn, isEnable, mIsP2pListening);
+ ALOGV("%s: enter isEnable: %u mIsP2pListening: %u", fn, isEnable, mIsP2pListening);
// If request to enable P2P listening, and we were not already listening
if ( (isEnable == true) && (mIsP2pListening == false) && (mP2pListenTechMask != 0) )
@@ -1169,7 +1169,7 @@
mIsP2pListening = true;
}
else
- ALOGE ("%s: fail enable listen; error=0x%X", fn, nfaStat);
+ ALOGE("%s: fail enable listen; error=0x%X", fn, nfaStat);
}
else if ( (isEnable == false) && (mIsP2pListening == true) )
{
@@ -1181,9 +1181,9 @@
mIsP2pListening = false;
}
else
- ALOGE ("%s: fail disable listen; error=0x%X", fn, nfaStat);
+ ALOGE("%s: fail disable listen; error=0x%X", fn, nfaStat);
}
- ALOGD ("%s: exit; mIsP2pListening: %u", fn, mIsP2pListening);
+ ALOGV("%s: exit; mIsP2pListening: %u", fn, mIsP2pListening);
}
@@ -1200,7 +1200,7 @@
void PeerToPeer::handleNfcOnOff (bool isOn)
{
static const char fn [] = "PeerToPeer::handleNfcOnOff";
- ALOGD ("%s: enter; is on=%u", fn, isOn);
+ ALOGV("%s: enter; is on=%u", fn, isOn);
mIsP2pListening = false; // In both cases, P2P will not be listening
@@ -1248,7 +1248,7 @@
} //loop
}
- ALOGD ("%s: exit", fn);
+ ALOGV("%s: exit", fn);
}
@@ -1269,12 +1269,12 @@
sp<P2pServer> pSrv = NULL;
sp<NfaConn> pConn = NULL;
- ALOGD_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: enter; event=0x%X", fn, p2pEvent);
+ ALOGV_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: enter; event=0x%X", fn, p2pEvent);
switch (p2pEvent)
{
case NFA_P2P_REG_SERVER_EVT: // NFA_P2pRegisterServer() has started to listen
- ALOGD ("%s: NFA_P2P_REG_SERVER_EVT; handle: 0x%04x; service sap=0x%02x name: %s", fn,
+ ALOGV("%s: NFA_P2P_REG_SERVER_EVT; handle: 0x%04x; service sap=0x%02x name: %s", fn,
eventData->reg_server.server_handle, eventData->reg_server.server_sap, eventData->reg_server.service_name);
sP2p.mMutex.lock();
@@ -1282,7 +1282,7 @@
sP2p.mMutex.unlock();
if (pSrv == NULL)
{
- ALOGE ("%s: NFA_P2P_REG_SERVER_EVT for unknown service: %s", fn, eventData->reg_server.service_name);
+ ALOGE("%s: NFA_P2P_REG_SERVER_EVT for unknown service: %s", fn, eventData->reg_server.service_name);
}
else
{
@@ -1293,15 +1293,15 @@
break;
case NFA_P2P_ACTIVATED_EVT: //remote device has activated
- ALOGD ("%s: NFA_P2P_ACTIVATED_EVT; handle: 0x%04x", fn, eventData->activated.handle);
+ ALOGV("%s: NFA_P2P_ACTIVATED_EVT; handle: 0x%04x", fn, eventData->activated.handle);
break;
case NFA_P2P_DEACTIVATED_EVT:
- ALOGD ("%s: NFA_P2P_DEACTIVATED_EVT; handle: 0x%04x", fn, eventData->activated.handle);
+ ALOGV("%s: NFA_P2P_DEACTIVATED_EVT; handle: 0x%04x", fn, eventData->activated.handle);
break;
case NFA_P2P_CONN_REQ_EVT:
- ALOGD ("%s: NFA_P2P_CONN_REQ_EVT; nfa server h=0x%04x; nfa conn h=0x%04x; remote sap=0x%02x", fn,
+ ALOGV("%s: NFA_P2P_CONN_REQ_EVT; nfa server h=0x%04x; nfa conn h=0x%04x; remote sap=0x%02x", fn,
eventData->conn_req.server_handle, eventData->conn_req.conn_handle, eventData->conn_req.remote_sap);
sP2p.mMutex.lock();
@@ -1309,15 +1309,15 @@
sP2p.mMutex.unlock();
if (pSrv == NULL)
{
- ALOGE ("%s: NFA_P2P_CONN_REQ_EVT; unknown server h", fn);
+ ALOGE("%s: NFA_P2P_CONN_REQ_EVT; unknown server h", fn);
return;
}
- ALOGD ("%s: NFA_P2P_CONN_REQ_EVT; server jni h=%u", fn, pSrv->mJniHandle);
+ ALOGV("%s: NFA_P2P_CONN_REQ_EVT; server jni h=%u", fn, pSrv->mJniHandle);
// Look for a connection block that is waiting (handle invalid)
if ((pConn = pSrv->findServerConnection((tNFA_HANDLE) NFA_HANDLE_INVALID)) == NULL)
{
- ALOGE ("%s: NFA_P2P_CONN_REQ_EVT; server not listening", fn);
+ ALOGE("%s: NFA_P2P_CONN_REQ_EVT; server not listening", fn);
}
else
{
@@ -1325,44 +1325,44 @@
pConn->mNfaConnHandle = eventData->conn_req.conn_handle;
pConn->mRemoteMaxInfoUnit = eventData->conn_req.remote_miu;
pConn->mRemoteRecvWindow = eventData->conn_req.remote_rw;
- ALOGD ("%s: NFA_P2P_CONN_REQ_EVT; server jni h=%u; conn jni h=%u; notify conn req", fn, pSrv->mJniHandle, pConn->mJniHandle);
+ ALOGV("%s: NFA_P2P_CONN_REQ_EVT; server jni h=%u; conn jni h=%u; notify conn req", fn, pSrv->mJniHandle, pConn->mJniHandle);
pSrv->mConnRequestEvent.notifyOne(); //unblock accept()
}
break;
case NFA_P2P_CONNECTED_EVT:
- ALOGD ("%s: NFA_P2P_CONNECTED_EVT; h=0x%x remote sap=0x%X", fn,
+ ALOGV("%s: NFA_P2P_CONNECTED_EVT; h=0x%x remote sap=0x%X", fn,
eventData->connected.client_handle, eventData->connected.remote_sap);
break;
case NFA_P2P_DISC_EVT:
- ALOGD ("%s: NFA_P2P_DISC_EVT; h=0x%04x; reason=0x%X", fn, eventData->disc.handle, eventData->disc.reason);
+ ALOGV("%s: NFA_P2P_DISC_EVT; h=0x%04x; reason=0x%X", fn, eventData->disc.handle, eventData->disc.reason);
// Look for the connection block
if ((pConn = sP2p.findConnection(eventData->disc.handle)) == NULL)
{
- ALOGE ("%s: NFA_P2P_DISC_EVT: can't find conn for NFA handle: 0x%04x", fn, eventData->disc.handle);
+ ALOGE("%s: NFA_P2P_DISC_EVT: can't find conn for NFA handle: 0x%04x", fn, eventData->disc.handle);
}
else
{
sP2p.mDisconnectMutex.lock ();
pConn->mNfaConnHandle = NFA_HANDLE_INVALID;
{
- ALOGD ("%s: NFA_P2P_DISC_EVT; try guard disconn event", fn);
+ ALOGV("%s: NFA_P2P_DISC_EVT; try guard disconn event", fn);
SyncEventGuard guard3 (pConn->mDisconnectingEvent);
pConn->mDisconnectingEvent.notifyOne ();
- ALOGD ("%s: NFA_P2P_DISC_EVT; notified disconn event", fn);
+ ALOGV("%s: NFA_P2P_DISC_EVT; notified disconn event", fn);
}
{
- ALOGD ("%s: NFA_P2P_DISC_EVT; try guard congest event", fn);
+ ALOGV("%s: NFA_P2P_DISC_EVT; try guard congest event", fn);
SyncEventGuard guard1 (pConn->mCongEvent);
pConn->mCongEvent.notifyOne (); //unblock write (if congested)
- ALOGD ("%s: NFA_P2P_DISC_EVT; notified congest event", fn);
+ ALOGV("%s: NFA_P2P_DISC_EVT; notified congest event", fn);
}
{
- ALOGD ("%s: NFA_P2P_DISC_EVT; try guard read event", fn);
+ ALOGV("%s: NFA_P2P_DISC_EVT; try guard read event", fn);
SyncEventGuard guard2 (pConn->mReadEvent);
pConn->mReadEvent.notifyOne (); //unblock receive()
- ALOGD ("%s: NFA_P2P_DISC_EVT; notified read event", fn);
+ ALOGV("%s: NFA_P2P_DISC_EVT; notified read event", fn);
}
sP2p.mDisconnectMutex.unlock ();
}
@@ -1372,11 +1372,11 @@
// Look for the connection block
if ((pConn = sP2p.findConnection(eventData->data.handle)) == NULL)
{
- ALOGE ("%s: NFA_P2P_DATA_EVT: can't find conn for NFA handle: 0x%04x", fn, eventData->data.handle);
+ ALOGE("%s: NFA_P2P_DATA_EVT: can't find conn for NFA handle: 0x%04x", fn, eventData->data.handle);
}
else
{
- ALOGD_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: NFA_P2P_DATA_EVT; h=0x%X; remote sap=0x%X", fn,
+ ALOGV_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: NFA_P2P_DATA_EVT; h=0x%X; remote sap=0x%X", fn,
eventData->data.handle, eventData->data.remote_sap);
SyncEventGuard guard (pConn->mReadEvent);
pConn->mReadEvent.notifyOne();
@@ -1387,11 +1387,11 @@
// Look for the connection block
if ((pConn = sP2p.findConnection(eventData->congest.handle)) == NULL)
{
- ALOGE ("%s: NFA_P2P_CONGEST_EVT: can't find conn for NFA handle: 0x%04x", fn, eventData->congest.handle);
+ ALOGE("%s: NFA_P2P_CONGEST_EVT: can't find conn for NFA handle: 0x%04x", fn, eventData->congest.handle);
}
else
{
- ALOGD ("%s: NFA_P2P_CONGEST_EVT; nfa handle: 0x%04x congested: %u", fn,
+ ALOGV("%s: NFA_P2P_CONGEST_EVT; nfa handle: 0x%04x congested: %u", fn,
eventData->congest.handle, eventData->congest.is_congested);
if (eventData->congest.is_congested == FALSE)
{
@@ -1402,10 +1402,10 @@
break;
default:
- ALOGE ("%s: unknown event 0x%X ????", fn, p2pEvent);
+ ALOGV("%s: unknown event 0x%X ????", fn, p2pEvent);
break;
}
- ALOGD_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: exit", fn);
+ ALOGV_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: exit", fn);
}
@@ -1426,7 +1426,7 @@
sp<NfaConn> pConn = NULL;
sp<P2pClient> pClient = NULL;
- ALOGD_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: enter; event=%u", fn, p2pEvent);
+ ALOGV_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: enter; event=%u", fn, p2pEvent);
switch (p2pEvent)
{
@@ -1434,11 +1434,11 @@
// Look for a client that is trying to register
if ((pClient = sP2p.findClient ((tNFA_HANDLE)NFA_HANDLE_INVALID)) == NULL)
{
- ALOGE ("%s: NFA_P2P_REG_CLIENT_EVT: can't find waiting client", fn);
+ ALOGE("%s: NFA_P2P_REG_CLIENT_EVT: can't find waiting client", fn);
}
else
{
- ALOGD ("%s: NFA_P2P_REG_CLIENT_EVT; Conn Handle: 0x%04x, pClient: 0x%p", fn, eventData->reg_client.client_handle, pClient.get());
+ ALOGV("%s: NFA_P2P_REG_CLIENT_EVT; Conn Handle: 0x%04x, pClient: 0x%p", fn, eventData->reg_client.client_handle, pClient.get());
SyncEventGuard guard (pClient->mRegisteringEvent);
pClient->mNfaP2pClientHandle = eventData->reg_client.client_handle;
@@ -1450,27 +1450,27 @@
// Look for a client that is trying to register
if ((pClient = sP2p.findClient (eventData->activated.handle)) == NULL)
{
- ALOGE ("%s: NFA_P2P_ACTIVATED_EVT: can't find client", fn);
+ ALOGE("%s: NFA_P2P_ACTIVATED_EVT: can't find client", fn);
}
else
{
- ALOGD ("%s: NFA_P2P_ACTIVATED_EVT; Conn Handle: 0x%04x, pClient: 0x%p", fn, eventData->activated.handle, pClient.get());
+ ALOGV("%s: NFA_P2P_ACTIVATED_EVT; Conn Handle: 0x%04x, pClient: 0x%p", fn, eventData->activated.handle, pClient.get());
}
break;
case NFA_P2P_DEACTIVATED_EVT:
- ALOGD ("%s: NFA_P2P_DEACTIVATED_EVT: conn handle: 0x%X", fn, eventData->deactivated.handle);
+ ALOGV("%s: NFA_P2P_DEACTIVATED_EVT: conn handle: 0x%X", fn, eventData->deactivated.handle);
break;
case NFA_P2P_CONNECTED_EVT:
// Look for the client that is trying to connect
if ((pClient = sP2p.findClient (eventData->connected.client_handle)) == NULL)
{
- ALOGE ("%s: NFA_P2P_CONNECTED_EVT: can't find client: 0x%04x", fn, eventData->connected.client_handle);
+ ALOGE("%s: NFA_P2P_CONNECTED_EVT: can't find client: 0x%04x", fn, eventData->connected.client_handle);
}
else
{
- ALOGD ("%s: NFA_P2P_CONNECTED_EVT; client_handle=0x%04x conn_handle: 0x%04x remote sap=0x%X pClient: 0x%p", fn,
+ ALOGV("%s: NFA_P2P_CONNECTED_EVT; client_handle=0x%04x conn_handle: 0x%04x remote sap=0x%X pClient: 0x%p", fn,
eventData->connected.client_handle, eventData->connected.conn_handle, eventData->connected.remote_sap, pClient.get());
SyncEventGuard guard (pClient->mConnectingEvent);
@@ -1482,14 +1482,14 @@
break;
case NFA_P2P_DISC_EVT:
- ALOGD ("%s: NFA_P2P_DISC_EVT; h=0x%04x; reason=0x%X", fn, eventData->disc.handle, eventData->disc.reason);
+ ALOGV("%s: NFA_P2P_DISC_EVT; h=0x%04x; reason=0x%X", fn, eventData->disc.handle, eventData->disc.reason);
// Look for the connection block
if ((pConn = sP2p.findConnection(eventData->disc.handle)) == NULL)
{
// If no connection, may be a client that is trying to connect
if ((pClient = sP2p.findClient (eventData->disc.handle)) == NULL)
{
- ALOGE ("%s: NFA_P2P_DISC_EVT: can't find client for NFA handle: 0x%04x", fn, eventData->disc.handle);
+ ALOGE("%s: NFA_P2P_DISC_EVT: can't find client for NFA handle: 0x%04x", fn, eventData->disc.handle);
return;
}
// Unblock createDataLinkConn()
@@ -1501,22 +1501,22 @@
sP2p.mDisconnectMutex.lock ();
pConn->mNfaConnHandle = NFA_HANDLE_INVALID;
{
- ALOGD ("%s: NFA_P2P_DISC_EVT; try guard disconn event", fn);
+ ALOGV("%s: NFA_P2P_DISC_EVT; try guard disconn event", fn);
SyncEventGuard guard3 (pConn->mDisconnectingEvent);
pConn->mDisconnectingEvent.notifyOne ();
- ALOGD ("%s: NFA_P2P_DISC_EVT; notified disconn event", fn);
+ ALOGV("%s: NFA_P2P_DISC_EVT; notified disconn event", fn);
}
{
- ALOGD ("%s: NFA_P2P_DISC_EVT; try guard congest event", fn);
+ ALOGV("%s: NFA_P2P_DISC_EVT; try guard congest event", fn);
SyncEventGuard guard1 (pConn->mCongEvent);
pConn->mCongEvent.notifyOne(); //unblock write (if congested)
- ALOGD ("%s: NFA_P2P_DISC_EVT; notified congest event", fn);
+ ALOGV("%s: NFA_P2P_DISC_EVT; notified congest event", fn);
}
{
- ALOGD ("%s: NFA_P2P_DISC_EVT; try guard read event", fn);
+ ALOGV("%s: NFA_P2P_DISC_EVT; try guard read event", fn);
SyncEventGuard guard2 (pConn->mReadEvent);
pConn->mReadEvent.notifyOne(); //unblock receive()
- ALOGD ("%s: NFA_P2P_DISC_EVT; notified read event", fn);
+ ALOGV("%s: NFA_P2P_DISC_EVT; notified read event", fn);
}
sP2p.mDisconnectMutex.unlock ();
}
@@ -1526,11 +1526,11 @@
// Look for the connection block
if ((pConn = sP2p.findConnection(eventData->data.handle)) == NULL)
{
- ALOGE ("%s: NFA_P2P_DATA_EVT: can't find conn for NFA handle: 0x%04x", fn, eventData->data.handle);
+ ALOGE("%s: NFA_P2P_DATA_EVT: can't find conn for NFA handle: 0x%04x", fn, eventData->data.handle);
}
else
{
- ALOGD_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: NFA_P2P_DATA_EVT; h=0x%X; remote sap=0x%X", fn,
+ ALOGV_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: NFA_P2P_DATA_EVT; h=0x%X; remote sap=0x%X", fn,
eventData->data.handle, eventData->data.remote_sap);
SyncEventGuard guard (pConn->mReadEvent);
pConn->mReadEvent.notifyOne();
@@ -1541,11 +1541,11 @@
// Look for the connection block
if ((pConn = sP2p.findConnection(eventData->congest.handle)) == NULL)
{
- ALOGE ("%s: NFA_P2P_CONGEST_EVT: can't find conn for NFA handle: 0x%04x", fn, eventData->congest.handle);
+ ALOGE("%s: NFA_P2P_CONGEST_EVT: can't find conn for NFA handle: 0x%04x", fn, eventData->congest.handle);
}
else
{
- ALOGD_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: NFA_P2P_CONGEST_EVT; nfa handle: 0x%04x congested: %u", fn,
+ ALOGV_IF ((appl_trace_level>=BT_TRACE_LEVEL_DEBUG), "%s: NFA_P2P_CONGEST_EVT; nfa handle: 0x%04x congested: %u", fn,
eventData->congest.handle, eventData->congest.is_congested);
SyncEventGuard guard (pConn->mCongEvent);
@@ -1554,7 +1554,7 @@
break;
default:
- ALOGE ("%s: unknown event 0x%X ????", fn, p2pEvent);
+ ALOGE("%s: unknown event 0x%X ????", fn, p2pEvent);
break;
}
}
@@ -1630,7 +1630,7 @@
bool P2pServer::registerWithStack()
{
static const char fn [] = "P2pServer::registerWithStack";
- ALOGD ("%s: enter; service name: %s JNI handle: %u", fn, mServiceName.c_str(), mJniHandle);
+ ALOGV("%s: enter; service name: %s JNI handle: %u", fn, mServiceName.c_str(), mJniHandle);
tNFA_STATUS stat = NFA_STATUS_OK;
uint8_t serverSap = NFA_P2P_ANY_SAP;
@@ -1656,7 +1656,7 @@
LLCP_DATA_LINK_TIMEOUT,
LLCP_DELAY_TIME_TO_SEND_FIRST_PDU);
if (stat != NFA_STATUS_OK)
- ALOGE ("%s: fail set LLCP config; error=0x%X", fn, stat);
+ ALOGE("%s: fail set LLCP config; error=0x%X", fn, stat);
if (sSnepServiceName.compare(mServiceName) == 0)
serverSap = LLCP_SAP_SNEP; //LLCP_SAP_SNEP == 4
@@ -1667,10 +1667,10 @@
PeerToPeer::nfaServerCallback);
if (stat != NFA_STATUS_OK)
{
- ALOGE ("%s: fail register p2p server; error=0x%X", fn, stat);
+ ALOGE("%s: fail register p2p server; error=0x%X", fn, stat);
return (false);
}
- ALOGD ("%s: wait for listen-completion event", fn);
+ ALOGV("%s: wait for listen-completion event", fn);
// Wait for NFA_P2P_REG_SERVER_EVT
mRegServerEvent.wait ();
}
@@ -1686,44 +1686,44 @@
sp<NfaConn> connection = allocateConnection(connJniHandle);
if (connection == NULL) {
- ALOGE ("%s: failed to allocate new server connection", fn);
+ ALOGE("%s: failed to allocate new server connection", fn);
return false;
}
{
// Wait for NFA_P2P_CONN_REQ_EVT or NFA_NDEF_DATA_EVT when remote device requests connection
SyncEventGuard guard (mConnRequestEvent);
- ALOGD ("%s: serverJniHandle: %u; connJniHandle: %u; wait for incoming connection", fn,
+ ALOGV("%s: serverJniHandle: %u; connJniHandle: %u; wait for incoming connection", fn,
serverJniHandle, connJniHandle);
mConnRequestEvent.wait();
- ALOGD ("%s: serverJniHandle: %u; connJniHandle: %u; nfa conn h: 0x%X; got incoming connection", fn,
+ ALOGV("%s: serverJniHandle: %u; connJniHandle: %u; nfa conn h: 0x%X; got incoming connection", fn,
serverJniHandle, connJniHandle, connection->mNfaConnHandle);
}
if (connection->mNfaConnHandle == NFA_HANDLE_INVALID)
{
removeServerConnection(connJniHandle);
- ALOGD ("%s: no handle assigned", fn);
+ ALOGV("%s: no handle assigned", fn);
return (false);
}
if (maxInfoUnit > (int)LLCP_MIU)
{
- ALOGD ("%s: overriding the miu passed by the app(%d) with stack miu(%zu)", fn, maxInfoUnit, LLCP_MIU);
+ ALOGV("%s: overriding the miu passed by the app(%d) with stack miu(%zu)", fn, maxInfoUnit, LLCP_MIU);
maxInfoUnit = LLCP_MIU;
}
- ALOGD ("%s: serverJniHandle: %u; connJniHandle: %u; nfa conn h: 0x%X; try accept", fn,
+ ALOGV("%s: serverJniHandle: %u; connJniHandle: %u; nfa conn h: 0x%X; try accept", fn,
serverJniHandle, connJniHandle, connection->mNfaConnHandle);
nfaStat = NFA_P2pAcceptConn (connection->mNfaConnHandle, maxInfoUnit, recvWindow);
if (nfaStat != NFA_STATUS_OK)
{
- ALOGE ("%s: fail to accept remote; error=0x%X", fn, nfaStat);
+ ALOGE("%s: fail to accept remote; error=0x%X", fn, nfaStat);
return (false);
}
- ALOGD ("%s: exit; serverJniHandle: %u; connJniHandle: %u; nfa conn h: 0x%X", fn,
+ ALOGV("%s: exit; serverJniHandle: %u; connJniHandle: %u; nfa conn h: 0x%X", fn,
serverJniHandle, connJniHandle, connection->mNfaConnHandle);
return (true);
}
diff --git a/nci/jni/Pn544Interop.cpp b/nci/jni/Pn544Interop.cpp
index 3247243..f824f2a 100644
--- a/nci/jni/Pn544Interop.cpp
+++ b/nci/jni/Pn544Interop.cpp
@@ -59,7 +59,7 @@
*******************************************************************************/
void pn544InteropStopPolling ()
{
- ALOGD ("%s: enter", __func__);
+ ALOGV("%s: enter", __func__);
gMutex.lock ();
gTimer.kill ();
android::startStopPolling (false);
@@ -67,7 +67,7 @@
gAbortNow = false;
gTimer.set (gIntervalTime, pn544InteropStartPolling); //after some time, start polling again
gMutex.unlock ();
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
}
@@ -83,32 +83,32 @@
*******************************************************************************/
void pn544InteropStartPolling (union sigval)
{
- ALOGD ("%s: enter", __func__);
+ ALOGV("%s: enter", __func__);
gMutex.lock ();
NfcTag::ActivationState state = NfcTag::getInstance ().getActivationState ();
if (gAbortNow)
{
- ALOGD ("%s: abort now", __func__);
+ ALOGV("%s: abort now", __func__);
gIsBusy = false;
goto TheEnd;
}
if (state == NfcTag::Idle)
{
- ALOGD ("%s: start polling", __func__);
+ ALOGV("%s: start polling", __func__);
android::startStopPolling (true);
gIsBusy = false;
}
else
{
- ALOGD ("%s: try again later", __func__);
+ ALOGV("%s: try again later", __func__);
gTimer.set (gIntervalTime, pn544InteropStartPolling); //after some time, start polling again
}
TheEnd:
gMutex.unlock ();
- ALOGD ("%s: exit", __func__);
+ ALOGV("%s: exit", __func__);
}
@@ -127,7 +127,7 @@
gMutex.lock ();
isBusy = gIsBusy;
gMutex.unlock ();
- ALOGD ("%s: %u", __func__, isBusy);
+ ALOGV("%s: %u", __func__, isBusy);
return isBusy;
}
@@ -143,7 +143,7 @@
*******************************************************************************/
void pn544InteropAbortNow ()
{
- ALOGD ("%s", __func__);
+ ALOGV("%s", __func__);
gMutex.lock ();
gAbortNow = true;
gMutex.unlock ();
diff --git a/nci/jni/PowerSwitch.cpp b/nci/jni/PowerSwitch.cpp
index d2b5fe8..f21133f 100755
--- a/nci/jni/PowerSwitch.cpp
+++ b/nci/jni/PowerSwitch.cpp
@@ -101,10 +101,10 @@
mMutex.lock ();
- ALOGD ("%s: level=%s (%u)", fn, powerLevelToString(level), level);
+ ALOGV("%s: level=%s (%u)", fn, powerLevelToString(level), level);
if (GetNumValue (NAME_SCREEN_OFF_POWER_STATE, &num, sizeof(num)))
mDesiredScreenOffPowerState = (int) num;
- ALOGD ("%s: desired screen-off state=%d", fn, mDesiredScreenOffPowerState);
+ ALOGV("%s: desired screen-off state=%d", fn, mDesiredScreenOffPowerState);
switch (level)
{
@@ -119,7 +119,7 @@
break;
default:
- ALOGE ("%s: not handled", fn);
+ ALOGE("%s: not handled", fn);
break;
}
mMutex.unlock ();
@@ -162,7 +162,7 @@
mMutex.lock ();
- ALOGD ("%s: level=%s (%u)", fn, powerLevelToString(newLevel), newLevel);
+ ALOGV("%s: level=%s (%u)", fn, powerLevelToString(newLevel), newLevel);
if (mCurrLevel == newLevel)
{
retval = true;
@@ -171,7 +171,7 @@
if (mCurrLevel == UNKNOWN_LEVEL)
{
- ALOGE ("%s: unknown power level", fn);
+ ALOGE("%s: unknown power level", fn);
goto TheEnd;
}
@@ -182,7 +182,7 @@
SyncEventGuard g (gDeactivatedEvent);
if (gActivated)
{
- ALOGD("%s: wait for deactivation", fn);
+ ALOGV("%s: wait for deactivation", fn);
gDeactivatedEvent.wait ();
}
mMutex.lock ();
@@ -207,11 +207,11 @@
break;
default:
- ALOGE ("%s: not handled", fn);
+ ALOGE("%s: not handled", fn);
break;
}
- ALOGD("%s: actual power level=%s", fn, powerLevelToString(mCurrLevel));
+ ALOGV("%s: actual power level=%s", fn, powerLevelToString(mCurrLevel));
TheEnd:
mMutex.unlock ();
@@ -221,7 +221,7 @@
bool PowerSwitch::setScreenOffPowerState (ScreenOffPowerState newState)
{
- ALOGD ("PowerSwitch::setScreenOffPowerState: level=%s (%u)",
+ ALOGV("PowerSwitch::setScreenOffPowerState: level=%s (%u)",
screenOffPowerStateToString(newState), newState);
mMutex.lock ();
@@ -248,7 +248,7 @@
mMutex.lock ();
mCurrActivity &= ~deactivated;
retVal = mCurrActivity != 0;
- ALOGD ("PowerSwitch::setModeOff(deactivated=0x%x) : mCurrActivity=0x%x", deactivated, mCurrActivity);
+ ALOGV("PowerSwitch::setModeOff(deactivated=0x%x) : mCurrActivity=0x%x", deactivated, mCurrActivity);
mMutex.unlock ();
return retVal;
}
@@ -270,7 +270,7 @@
mMutex.lock ();
mCurrActivity |= activated;
retVal = mCurrActivity != 0;
- ALOGD ("PowerSwitch::setModeOn(activated=0x%x) : mCurrActivity=0x%x", activated, mCurrActivity);
+ ALOGV("PowerSwitch::setModeOn(activated=0x%x) : mCurrActivity=0x%x", activated, mCurrActivity);
mMutex.unlock ();
return retVal;
}
@@ -289,7 +289,7 @@
bool PowerSwitch::setPowerOffSleepState (bool sleep)
{
static const char fn [] = "PowerSwitch::setPowerOffSleepState";
- ALOGD ("%s: enter; sleep=%u", fn, sleep);
+ ALOGV("%s: enter; sleep=%u", fn, sleep);
tNFA_STATUS stat = NFA_STATUS_FAILED;
bool retval = false;
@@ -300,7 +300,7 @@
{
SyncEventGuard guard (mPowerStateEvent);
mExpectedDeviceMgtPowerState = NFA_DM_PWR_MODE_OFF_SLEEP; //if power adjustment is ok, then this is the expected state
- ALOGD ("%s: try power off", fn);
+ ALOGV("%s: try power off", fn);
stat = NFA_PowerOffSleepMode (TRUE);
if (stat == NFA_STATUS_OK)
{
@@ -309,13 +309,13 @@
}
else
{
- ALOGE ("%s: API fail; stat=0x%X", fn, stat);
+ ALOGE("%s: API fail; stat=0x%X", fn, stat);
goto TheEnd;
}
}
else
{
- ALOGE ("%s: power is not ON; curr device mgt power state=%s (%u)", fn,
+ ALOGE("%s: power is not ON; curr device mgt power state=%s (%u)", fn,
deviceMgtPowerStateToString (mCurrDeviceMgtPowerState), mCurrDeviceMgtPowerState);
goto TheEnd;
}
@@ -328,14 +328,14 @@
SyncEventGuard guard (mPowerStateEvent);
mCurrDeviceMgtPowerState = NFA_DM_PWR_STATE_UNKNOWN;
mExpectedDeviceMgtPowerState = NFA_DM_PWR_MODE_FULL; //if power adjustment is ok, then this is the expected state
- ALOGD ("%s: try full power", fn);
+ ALOGV("%s: try full power", fn);
stat = NFA_PowerOffSleepMode (FALSE);
if (stat == NFA_STATUS_OK)
{
mPowerStateEvent.wait ();
if (mCurrDeviceMgtPowerState != NFA_DM_PWR_MODE_FULL)
{
- ALOGE ("%s: unable to full power; curr device mgt power stat=%s (%u)", fn,
+ ALOGE("%s: unable to full power; curr device mgt power stat=%s (%u)", fn,
deviceMgtPowerStateToString (mCurrDeviceMgtPowerState), mCurrDeviceMgtPowerState);
goto TheEnd;
}
@@ -344,13 +344,13 @@
}
else
{
- ALOGE ("%s: API fail; stat=0x%X", fn, stat);
+ ALOGE("%s: API fail; stat=0x%X", fn, stat);
goto TheEnd;
}
}
else
{
- ALOGE ("%s: not in power-off state; curr device mgt power state=%s (%u)", fn,
+ ALOGE("%s: not in power-off state; curr device mgt power state=%s (%u)", fn,
deviceMgtPowerStateToString (mCurrDeviceMgtPowerState), mCurrDeviceMgtPowerState);
goto TheEnd;
}
@@ -358,7 +358,7 @@
retval = true;
TheEnd:
- ALOGD ("%s: exit; return %u", fn, retval);
+ ALOGV("%s: exit; return %u", fn, retval);
return retval;
}
@@ -451,7 +451,7 @@
void PowerSwitch::abort ()
{
static const char fn [] = "PowerSwitch::abort";
- ALOGD ("%s", fn);
+ ALOGV("%s", fn);
SyncEventGuard guard (mPowerStateEvent);
mPowerStateEvent.notifyOne ();
}
@@ -477,7 +477,7 @@
case NFA_DM_PWR_MODE_CHANGE_EVT:
{
tNFA_DM_PWR_MODE_CHANGE& power_mode = eventData->power_mode;
- ALOGD ("%s: NFA_DM_PWR_MODE_CHANGE_EVT; status=0x%X; device mgt power state=%s (0x%X)", fn,
+ ALOGV("%s: NFA_DM_PWR_MODE_CHANGE_EVT; status=0x%X; device mgt power state=%s (0x%X)", fn,
power_mode.status, sPowerSwitch.deviceMgtPowerStateToString (power_mode.power_mode),
power_mode.power_mode);
SyncEventGuard guard (sPowerSwitch.mPowerStateEvent);
diff --git a/nci/jni/RouteDataSet.cpp b/nci/jni/RouteDataSet.cpp
index 916e707..1659e33 100644
--- a/nci/jni/RouteDataSet.cpp
+++ b/nci/jni/RouteDataSet.cpp
@@ -116,14 +116,13 @@
** Returns: True if ok.
**
*******************************************************************************/
-bool RouteDataSet::initialize ()
+bool RouteDataSet::initialize()
{
- static const char fn [] = "RouteDataSet::initialize";
- ALOGD ("%s: enter", fn);
+ ALOGV("%s: enter", "RouteDataSet::initialize");
//check that the libxml2 version in use is compatible
//with the version the software has been compiled with
LIBXML_TEST_VERSION
- ALOGD ("%s: exit; return=true", fn);
+ ALOGV("%s: exit; return=true", "RouteDataSet::initialize");
return true;
}
@@ -137,10 +136,10 @@
** Returns: None.
**
*******************************************************************************/
-void RouteDataSet::deleteDatabase ()
+void RouteDataSet::deleteDatabase()
{
- static const char fn [] = "RouteDataSet::deleteDatabase";
- ALOGD ("%s: default db size=%zu; sec elem db size=%zu", fn, mDefaultRouteDatabase.size(), mSecElemRouteDatabase.size());
+ ALOGV("%s: default db size=%zu; sec elem db size=%zu", "RouteDataSet::deleteDatabase",
+ mDefaultRouteDatabase.size(), mSecElemRouteDatabase.size());
Database::iterator it;
for (it = mDefaultRouteDatabase.begin(); it != mDefaultRouteDatabase.end(); it++)
@@ -165,7 +164,7 @@
bool RouteDataSet::import ()
{
static const char fn [] = "RouteDataSet::import";
- ALOGD ("%s: enter", fn);
+ ALOGV("%s: enter", fn);
bool retval = false;
xmlDocPtr doc;
xmlNodePtr node1;
@@ -177,17 +176,17 @@
doc = xmlParseFile (strFilename.c_str());
if (doc == NULL)
{
- ALOGD ("%s: fail parse", fn);
+ ALOGV("%s: fail parse", fn);
goto TheEnd;
}
node1 = xmlDocGetRootElement (doc);
if (node1 == NULL)
{
- ALOGE ("%s: fail root element", fn);
+ ALOGE("%s: fail root element", fn);
goto TheEnd;
}
- ALOGD ("%s: root=%s", fn, node1->name);
+ ALOGV("%s: root=%s", fn, node1->name);
node1 = node1->xmlChildrenNode;
while (node1) //loop through all elements in <Routes ...
@@ -197,7 +196,7 @@
xmlChar* value = xmlGetProp (node1, (const xmlChar*) "Type");
if (value && (xmlStrcmp (value, (const xmlChar*) "SecElemSelectedRoutes") == 0))
{
- ALOGD ("%s: found SecElemSelectedRoutes", fn);
+ ALOGV("%s: found SecElemSelectedRoutes", fn);
xmlNodePtr node2 = node1->xmlChildrenNode;
while (node2) //loop all elements in <Route Type="SecElemSelectedRoutes" ...
{
@@ -210,7 +209,7 @@
}
else if (value && (xmlStrcmp (value, (const xmlChar*) "DefaultRoutes") == 0))
{
- ALOGD ("%s: found DefaultRoutes", fn);
+ ALOGV("%s: found DefaultRoutes", fn);
xmlNodePtr node2 = node1->xmlChildrenNode;
while (node2) //loop all elements in <Route Type="DefaultRoutes" ...
{
@@ -231,7 +230,7 @@
TheEnd:
xmlFreeDoc (doc);
xmlCleanupParser ();
- ALOGD ("%s: exit; return=%u", fn, retval);
+ ALOGV("%s: exit; return=%u", fn, retval);
return retval;
}
@@ -259,22 +258,22 @@
fh = fopen (filename.c_str (), "w");
if (fh == NULL)
{
- ALOGE ("%s: fail to open file", fn);
+ ALOGE("%s: fail to open file", fn);
return false;
}
actualWritten = fwrite (routesXml, sizeof(char), strlen(routesXml), fh);
retval = actualWritten == strlen(routesXml);
fclose (fh);
- ALOGD ("%s: wrote %zu bytes", fn, actualWritten);
+ ALOGV("%s: wrote %zu bytes", fn, actualWritten);
if (retval == false)
- ALOGE ("%s: error during write", fn);
+ ALOGE("%s: error during write", fn);
//set file permission to
//owner read, write; group read; other read
stat = chmod (filename.c_str (), S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
if (stat == -1)
- ALOGE ("%s: error during chmod", fn);
+ ALOGE("%s: error during chmod", fn);
return retval;
}
@@ -291,7 +290,6 @@
*******************************************************************************/
bool RouteDataSet::loadFromFile (std::string& routesXml)
{
- static const char fn [] = "RouteDataSet::loadFromFile";
FILE* fh = NULL;
size_t actual = 0;
char buffer [1024];
@@ -301,7 +299,7 @@
fh = fopen (filename.c_str (), "r");
if (fh == NULL)
{
- ALOGD ("%s: fail to open file", fn);
+ ALOGV("%s: fail to open file", "RouteDataSet::loadFromFile");
return false;
}
@@ -313,7 +311,7 @@
routesXml.append (buffer, actual);
}
fclose (fh);
- ALOGD ("%s: read %zu bytes", fn, routesXml.length());
+ ALOGV("%s: read %zu bytes", "RouteDataSet::loadFromFile", routesXml.length());
return true;
}
@@ -333,7 +331,6 @@
*******************************************************************************/
void RouteDataSet::importProtocolRoute (xmlNodePtr& element, Database& database)
{
- static const char fn [] = "RouteDataSet::importProtocolRoute";
const xmlChar* id = (const xmlChar*) "Id";
const xmlChar* secElem = (const xmlChar*) "SecElem";
const xmlChar* trueString = (const xmlChar*) "true";
@@ -343,7 +340,7 @@
RouteDataForProtocol* data = new RouteDataForProtocol;
xmlChar* value = NULL;
- ALOGD_IF (sDebug, "%s: element=%s", fn, element->name);
+ ALOGV_IF(sDebug, "%s: element=%s", "RouteDataSet::importProtocolRoute", element->name);
value = xmlGetProp (element, id);
if (value)
{
@@ -356,7 +353,7 @@
else if (xmlStrcmp (value, (const xmlChar*) "IsoDep") == 0)
data->mProtocol = NFA_PROTOCOL_MASK_ISO_DEP;
xmlFree (value);
- ALOGD_IF (sDebug, "%s: %s=0x%X", fn, id, data->mProtocol);
+ ALOGV_IF(sDebug, "%s: %s=0x%X", "RouteDataSet::importProtocolRoute", id, data->mProtocol);
}
value = xmlGetProp (element, secElem);
@@ -365,7 +362,7 @@
data->mNfaEeHandle = strtol ((char*) value, NULL, 16);
xmlFree (value);
data->mNfaEeHandle = data->mNfaEeHandle | NFA_HANDLE_GROUP_EE;
- ALOGD_IF (sDebug, "%s: %s=0x%X", fn, secElem, data->mNfaEeHandle);
+ ALOGV_IF(sDebug, "%s: %s=0x%X", "RouteDataSet::importProtocolRoute", secElem, data->mNfaEeHandle);
}
value = xmlGetProp (element, switchOn);
@@ -405,7 +402,6 @@
*******************************************************************************/
void RouteDataSet::importTechnologyRoute (xmlNodePtr& element, Database& database)
{
- static const char fn [] = "RouteDataSet::importTechnologyRoute";
const xmlChar* id = (const xmlChar*) "Id";
const xmlChar* secElem = (const xmlChar*) "SecElem";
const xmlChar* trueString = (const xmlChar*) "true";
@@ -415,7 +411,7 @@
RouteDataForTechnology* data = new RouteDataForTechnology;
xmlChar* value = NULL;
- ALOGD_IF (sDebug, "%s: element=%s", fn, element->name);
+ ALOGV_IF(sDebug, "%s: element=%s", "RouteDataSet::importTechnologyRoute", element->name);
value = xmlGetProp (element, id);
if (value)
{
@@ -426,7 +422,8 @@
else if (xmlStrcmp (value, (const xmlChar*) "NfcF") == 0)
data->mTechnology = NFA_TECHNOLOGY_MASK_F;
xmlFree (value);
- ALOGD_IF (sDebug, "%s: %s=0x%X", fn, id, data->mTechnology);
+ ALOGV_IF(sDebug, "%s: %s=0x%X", "RouteDataSet::importTechnologyRoute", id,
+ data->mTechnology);
}
value = xmlGetProp (element, secElem);
@@ -435,7 +432,7 @@
data->mNfaEeHandle = strtol ((char*) value, NULL, 16);
xmlFree (value);
data->mNfaEeHandle = data->mNfaEeHandle | NFA_HANDLE_GROUP_EE;
- ALOGD_IF (sDebug, "%s: %s=0x%X", fn, secElem, data->mNfaEeHandle);
+ ALOGV_IF(sDebug, "%s: %s=0x%X", "RouteDataSet::importTechnologyRoute", secElem, data->mNfaEeHandle);
}
value = xmlGetProp (element, switchOn);
@@ -477,7 +474,7 @@
std::string filename (bcm_nfc_location);
filename.append (sConfigFile);
int stat = remove (filename.c_str());
- ALOGD ("%s: exit %u", fn, stat==0);
+ ALOGV("%s: exit %u", fn, stat==0);
return stat == 0;
}
@@ -519,7 +516,7 @@
static const char fn [] = "RouteDataSet::printDiagnostic";
Database* db = getDatabase (DefaultRouteDatabase);
- ALOGD ("%s: default route database", fn);
+ ALOGV("%s: default route database", fn);
for (Database::iterator iter = db->begin(); iter != db->end(); iter++)
{
RouteData* routeData = *iter;
@@ -528,19 +525,19 @@
case RouteData::ProtocolRoute:
{
RouteDataForProtocol* proto = (RouteDataForProtocol*) routeData;
- ALOGD ("%s: ee h=0x%X; protocol=0x%X", fn, proto->mNfaEeHandle, proto->mProtocol);
+ ALOGV("%s: ee h=0x%X; protocol=0x%X", fn, proto->mNfaEeHandle, proto->mProtocol);
}
break;
case RouteData::TechnologyRoute:
{
RouteDataForTechnology* tech = (RouteDataForTechnology*) routeData;
- ALOGD ("%s: ee h=0x%X; technology=0x%X", fn, tech->mNfaEeHandle, tech->mTechnology);
+ ALOGV("%s: ee h=0x%X; technology=0x%X", fn, tech->mNfaEeHandle, tech->mTechnology);
}
break;
}
}
- ALOGD ("%s: sec elem route database", fn);
+ ALOGV("%s: sec elem route database", fn);
db = getDatabase (SecElemRouteDatabase);
for (Database::iterator iter2 = db->begin(); iter2 != db->end(); iter2++)
{
@@ -550,13 +547,13 @@
case RouteData::ProtocolRoute:
{
RouteDataForProtocol* proto = (RouteDataForProtocol*) routeData;
- ALOGD ("%s: ee h=0x%X; protocol=0x%X", fn, proto->mNfaEeHandle, proto->mProtocol);
+ ALOGV("%s: ee h=0x%X; protocol=0x%X", fn, proto->mNfaEeHandle, proto->mProtocol);
}
break;
case RouteData::TechnologyRoute:
{
RouteDataForTechnology* tech = (RouteDataForTechnology*) routeData;
- ALOGD ("%s: ee h=0x%X; technology=0x%X", fn, tech->mNfaEeHandle, tech->mTechnology);
+ ALOGV("%s: ee h=0x%X; technology=0x%X", fn, tech->mNfaEeHandle, tech->mTechnology);
}
break;
}
diff --git a/nci/jni/RoutingManager.cpp b/nci/jni/RoutingManager.cpp
index 3839ec3..101dc0c 100755
--- a/nci/jni/RoutingManager.cpp
+++ b/nci/jni/RoutingManager.cpp
@@ -60,21 +60,21 @@
mActiveSeNfcF = num;
else
mActiveSeNfcF = 0x00;
- ALOGD("%s: Active SE for Nfc-F is 0x%02X", fn, mActiveSeNfcF);
+ ALOGV("%s: Active SE for Nfc-F is 0x%02X", fn, mActiveSeNfcF);
// Get the "default" route
if (GetNumValue("DEFAULT_ISODEP_ROUTE", &num, sizeof(num)))
mDefaultEe = num;
else
mDefaultEe = 0x00;
- ALOGD("%s: default route is 0x%02X", fn, mDefaultEe);
+ ALOGV("%s: default route is 0x%02X", fn, mDefaultEe);
// Get the "default" route for Nfc-F
if (GetNumValue("DEFAULT_NFCF_ROUTE", &num, sizeof(num)))
mDefaultEeNfcF = num;
else
mDefaultEeNfcF = 0x00;
- ALOGD("%s: default route for Nfc-F is 0x%02X", fn, mDefaultEeNfcF);
+ ALOGV("%s: default route for Nfc-F is 0x%02X", fn, mDefaultEeNfcF);
// Get the default "off-host" route. This is hard-coded at the Java layer
// but we can override it here to avoid forcing Java changes.
@@ -88,7 +88,7 @@
else
mAidMatchingMode = AID_MATCHING_EXACT_ONLY;
- ALOGD("%s: mOffHostEe=0x%02X", fn, mOffHostEe);
+ ALOGV("%s: mOffHostEe=0x%02X", fn, mOffHostEe);
memset (&mEeInfo, 0, sizeof(mEeInfo));
mReceivedEeInfo = false;
@@ -110,11 +110,11 @@
tNFA_STATUS nfaStat;
{
SyncEventGuard guard (mEeRegisterEvent);
- ALOGD ("%s: try ee register", fn);
+ ALOGV("%s: try ee register", fn);
nfaStat = NFA_EeRegister (nfaEeCallback);
if (nfaStat != NFA_STATUS_OK)
{
- ALOGE ("%s: fail ee register; error=0x%X", fn, nfaStat);
+ ALOGE("%s: fail ee register; error=0x%X", fn, nfaStat);
return false;
}
mEeRegisterEvent.wait ();
@@ -124,24 +124,24 @@
if ((mActiveSe != 0) || (mActiveSeNfcF != 0))
{
- ALOGD ("%s: Technology Routing (NfcASe:0x%02x, NfcFSe:0x%02x)", fn, mActiveSe, mActiveSeNfcF);
+ ALOGV("%s: Technology Routing (NfcASe:0x%02x, NfcFSe:0x%02x)", fn, mActiveSe, mActiveSeNfcF);
{
// Wait for EE info if needed
SyncEventGuard guard (mEeInfoEvent);
if (!mReceivedEeInfo)
{
- ALOGE("Waiting for EE info");
+ ALOGI("Waiting for EE info");
mEeInfoEvent.wait();
}
}
- ALOGD ("%s: Number of EE is %d", fn, mEeInfo.num_ee);
+ ALOGV("%s: Number of EE is %d", fn, mEeInfo.num_ee);
for (uint8_t i = 0; i < mEeInfo.num_ee; i++)
{
tNFA_HANDLE eeHandle = mEeInfo.ee_disc_info[i].ee_handle;
tNFA_TECHNOLOGY_MASK seTechMask = 0;
- ALOGD ("%s EE[%u] Handle: 0x%04x techA: 0x%02x techB: 0x%02x techF: 0x%02x techBprime: 0x%02x",
+ ALOGV("%s EE[%u] Handle: 0x%04x techA: 0x%02x techB: 0x%02x techF: 0x%02x techBprime: 0x%02x",
fn, i, eeHandle,
mEeInfo.ee_disc_info[i].la_protocol,
mEeInfo.ee_disc_info[i].lb_protocol,
@@ -158,19 +158,19 @@
seTechMask |= NFA_TECHNOLOGY_MASK_F;
}
- ALOGD ("%s: seTechMask[%u]=0x%02x", fn, i, seTechMask);
+ ALOGV("%s: seTechMask[%u]=0x%02x", fn, i, seTechMask);
if (seTechMask != 0x00)
{
- ALOGD("Configuring tech mask 0x%02x on EE 0x%04x", seTechMask, eeHandle);
+ ALOGV("Configuring tech mask 0x%02x on EE 0x%04x", seTechMask, eeHandle);
nfaStat = NFA_CeConfigureUiccListenTech(eeHandle, seTechMask);
if (nfaStat != NFA_STATUS_OK)
- ALOGE ("Failed to configure UICC listen technologies.");
+ ALOGE("Failed to configure UICC listen technologies.");
// Set technology routes to UICC if it's there
nfaStat = NFA_EeSetDefaultTechRouting(eeHandle, seTechMask, seTechMask, seTechMask);
if (nfaStat != NFA_STATUS_OK)
- ALOGE ("Failed to configure UICC technology routing.");
+ ALOGE("Failed to configure UICC technology routing.");
mSeTechMask |= seTechMask;
}
@@ -180,7 +180,7 @@
// Tell the host-routing to only listen on Nfc-A
nfaStat = NFA_CeSetIsoDepListenTech(NFA_TECHNOLOGY_MASK_A);
if (nfaStat != NFA_STATUS_OK)
- ALOGE ("Failed to configure CE IsoDep technologies");
+ ALOGE("Failed to configure CE IsoDep technologies");
// Register a wild-card for AIDs routed to the host
nfaStat = NFA_CeRegisterAidOnDH (NULL, 0, stackCallback);
@@ -214,7 +214,7 @@
if (nfaStat == NFA_STATUS_OK)
mRoutingEvent.wait ();
else
- ALOGE ("Fail to set default tech routing for Nfc-A/Nfc-F");
+ ALOGE("Fail to set default tech routing for Nfc-A/Nfc-F");
}
// Default routing for IsoDep and T3T protocol
protoMask = (NFA_PROTOCOL_MASK_ISO_DEP | NFA_PROTOCOL_MASK_T3T);
@@ -222,7 +222,7 @@
if (nfaStat == NFA_STATUS_OK)
mRoutingEvent.wait ();
else
- ALOGE ("Fail to set default proto routing for IsoDep and T3T");
+ ALOGE("Fail to set default proto routing for IsoDep and T3T");
}
else
{
@@ -234,7 +234,7 @@
if (nfaStat == NFA_STATUS_OK)
mRoutingEvent.wait ();
else
- ALOGE ("Fail to set default tech routing for Nfc-A");
+ ALOGE("Fail to set default tech routing for Nfc-A");
}
// Default routing for IsoDep protocol
protoMask = NFA_PROTOCOL_MASK_ISO_DEP;
@@ -242,7 +242,7 @@
if (nfaStat == NFA_STATUS_OK)
mRoutingEvent.wait ();
else
- ALOGE ("Fail to set default proto routing for IsoDep");
+ ALOGE("Fail to set default proto routing for IsoDep");
// Route Nfc-F to host if we don't have a SE
techMask = NFA_TECHNOLOGY_MASK_F;
@@ -252,7 +252,7 @@
if (nfaStat == NFA_STATUS_OK)
mRoutingEvent.wait ();
else
- ALOGE ("Fail to set default tech routing for Nfc-F");
+ ALOGE("Fail to set default tech routing for Nfc-F");
}
// Default routing for T3T protocol
protoMask = NFA_PROTOCOL_MASK_T3T;
@@ -260,7 +260,7 @@
if (nfaStat == NFA_STATUS_OK)
mRoutingEvent.wait ();
else
- ALOGE ("Fail to set default proto routing for T3T");
+ ALOGE("Fail to set default proto routing for T3T");
}
}
@@ -281,14 +281,14 @@
if (nfaStat == NFA_STATUS_OK)
mRoutingEvent.wait ();
else
- ALOGE ("Fail to set default tech routing for Nfc-A/Nfc-F");
+ ALOGE("Fail to set default tech routing for Nfc-A/Nfc-F");
}
// Default routing for IsoDep and T3T protocol
nfaStat = NFA_EeSetDefaultProtoRouting(mDefaultEe, 0, 0, 0);
if (nfaStat == NFA_STATUS_OK)
mRoutingEvent.wait ();
else
- ALOGE ("Fail to set default proto routing for IsoDep and T3T");
+ ALOGE("Fail to set default proto routing for IsoDep and T3T");
}
else
{
@@ -299,14 +299,14 @@
if (nfaStat == NFA_STATUS_OK)
mRoutingEvent.wait ();
else
- ALOGE ("Fail to set default tech routing for Nfc-A");
+ ALOGE("Fail to set default tech routing for Nfc-A");
}
// Default routing for IsoDep protocol
nfaStat = NFA_EeSetDefaultProtoRouting(mDefaultEe, 0, 0, 0);
if (nfaStat == NFA_STATUS_OK)
mRoutingEvent.wait ();
else
- ALOGE ("Fail to set default proto routing for IsoDep");
+ ALOGE("Fail to set default proto routing for IsoDep");
// Default routing for Nfc-F technology if we don't have a SE
if ((mSeTechMask & NFA_TECHNOLOGY_MASK_F) == 0)
@@ -315,29 +315,29 @@
if (nfaStat == NFA_STATUS_OK)
mRoutingEvent.wait ();
else
- ALOGE ("Fail to set default tech routing for Nfc-F");
+ ALOGE("Fail to set default tech routing for Nfc-F");
}
// Default routing for T3T protocol
nfaStat = NFA_EeSetDefaultProtoRouting(mDefaultEeNfcF, 0, 0, 0);
if (nfaStat == NFA_STATUS_OK)
mRoutingEvent.wait ();
else
- ALOGE ("Fail to set default proto routing for T3T");
+ ALOGE("Fail to set default proto routing for T3T");
}
}
bool RoutingManager::addAidRouting(const uint8_t* aid, uint8_t aidLen, int route)
{
static const char fn [] = "RoutingManager::addAidRouting";
- ALOGD ("%s: enter", fn);
+ ALOGV("%s: enter", fn);
tNFA_STATUS nfaStat = NFA_EeAddAidRouting(route, aidLen, (uint8_t*) aid, 0x01);
if (nfaStat == NFA_STATUS_OK)
{
- ALOGD ("%s: routed AID", fn);
+ ALOGV("%s: routed AID", fn);
return true;
} else
{
- ALOGE ("%s: failed to route AID", fn);
+ ALOGE("%s: failed to route AID", fn);
return false;
}
}
@@ -345,15 +345,15 @@
bool RoutingManager::removeAidRouting(const uint8_t* aid, uint8_t aidLen)
{
static const char fn [] = "RoutingManager::removeAidRouting";
- ALOGD ("%s: enter", fn);
+ ALOGV("%s: enter", fn);
tNFA_STATUS nfaStat = NFA_EeRemoveAidRouting(aidLen, (uint8_t*) aid);
if (nfaStat == NFA_STATUS_OK)
{
- ALOGD ("%s: removed AID", fn);
+ ALOGV("%s: removed AID", fn);
return true;
} else
{
- ALOGE ("%s: failed to remove AID", fn);
+ ALOGE("%s: failed to remove AID", fn);
return false;
}
}
@@ -362,7 +362,7 @@
{
static const char fn [] = "RoutingManager::commitRouting";
tNFA_STATUS nfaStat = 0;
- ALOGD ("%s", fn);
+ ALOGV("%s", fn);
{
SyncEventGuard guard (mEeUpdateEvent);
nfaStat = NFA_EeUpdateNow();
@@ -386,7 +386,7 @@
memset (&eeInfo, 0, sizeof(eeInfo));
if ((nfaStat = NFA_EeGetInfo (&actualNumEe, eeInfo)) != NFA_STATUS_OK)
{
- ALOGE ("%s: fail get info; error=0x%X", fn, nfaStat);
+ ALOGE("%s: fail get info; error=0x%X", fn, nfaStat);
return;
}
if (actualNumEe != 0)
@@ -397,7 +397,7 @@
&& (eeInfo[xx].ee_interface[0] != NCI_NFCEE_INTERFACE_HCI_ACCESS)
&& (eeInfo[xx].ee_status == NFA_EE_STATUS_ACTIVE))
{
- ALOGD ("%s: Handle: 0x%04x Change Status Active to Inactive", fn, eeInfo[xx].ee_handle);
+ ALOGV("%s: Handle: 0x%04x Change Status Active to Inactive", fn, eeInfo[xx].ee_handle);
SyncEventGuard guard (mEeSetModeEvent);
if ((nfaStat = NFA_EeModeSet (eeInfo[xx].ee_handle, NFA_EE_MD_DEACTIVATE)) == NFA_STATUS_OK)
{
@@ -405,14 +405,14 @@
}
else
{
- ALOGE ("Failed to set EE inactive");
+ ALOGE("Failed to set EE inactive");
}
}
}
}
else
{
- ALOGD ("%s: No active EEs found", fn);
+ ALOGV("%s: No active EEs found", fn);
}
}
@@ -422,7 +422,7 @@
ScopedAttach attach(mNativeData->vm, &e);
if (e == NULL)
{
- ALOGE ("jni env is null");
+ ALOGE("jni env is null");
return;
}
@@ -430,7 +430,7 @@
if (e->ExceptionCheck())
{
e->ExceptionClear();
- ALOGE ("fail notify");
+ ALOGE("fail notify");
}
}
@@ -441,7 +441,7 @@
ScopedAttach attach(mNativeData->vm, &e);
if (e == NULL)
{
- ALOGE ("jni env is null");
+ ALOGE("jni env is null");
return;
}
@@ -449,7 +449,7 @@
if (e->ExceptionCheck())
{
e->ExceptionClear();
- ALOGE ("fail notify");
+ ALOGE("fail notify");
}
}
@@ -482,14 +482,14 @@
ScopedAttach attach(mNativeData->vm, &e);
if (e == NULL)
{
- ALOGE ("jni env is null");
+ ALOGE("jni env is null");
goto TheEnd;
}
ScopedLocalRef<jobject> dataJavaArray(e, e->NewByteArray(mRxDataBuffer.size()));
if (dataJavaArray.get() == NULL)
{
- ALOGE ("fail allocate array");
+ ALOGE("fail allocate array");
goto TheEnd;
}
@@ -498,7 +498,7 @@
if (e->ExceptionCheck())
{
e->ExceptionClear();
- ALOGE ("fail fill array");
+ ALOGE("fail fill array");
goto TheEnd;
}
@@ -507,7 +507,7 @@
if (e->ExceptionCheck())
{
e->ExceptionClear();
- ALOGE ("fail notify");
+ ALOGE("fail notify");
}
}
TheEnd:
@@ -517,7 +517,7 @@
void RoutingManager::stackCallback (uint8_t event, tNFA_CONN_EVT_DATA* eventData)
{
static const char fn [] = "RoutingManager::stackCallback";
- ALOGD("%s: event=0x%X", fn, event);
+ ALOGV("%s: event=0x%X", fn, event);
RoutingManager& routingManager = RoutingManager::getInstance();
switch (event)
@@ -525,14 +525,14 @@
case NFA_CE_REGISTERED_EVT:
{
tNFA_CE_REGISTERED& ce_registered = eventData->ce_registered;
- ALOGD("%s: NFA_CE_REGISTERED_EVT; status=0x%X; h=0x%X", fn, ce_registered.status, ce_registered.handle);
+ ALOGV("%s: NFA_CE_REGISTERED_EVT; status=0x%X; h=0x%X", fn, ce_registered.status, ce_registered.handle);
}
break;
case NFA_CE_DEREGISTERED_EVT:
{
tNFA_CE_DEREGISTERED& ce_deregistered = eventData->ce_deregistered;
- ALOGD("%s: NFA_CE_DEREGISTERED_EVT; h=0x%X", fn, ce_deregistered.handle);
+ ALOGV("%s: NFA_CE_DEREGISTERED_EVT; h=0x%X", fn, ce_deregistered.handle);
}
break;
@@ -545,7 +545,7 @@
case NFA_DEACTIVATED_EVT:
case NFA_CE_DEACTIVATED_EVT:
{
- ALOGD("%s: NFA_DEACTIVATED_EVT, NFA_CE_DEACTIVATED_EVT", fn);
+ ALOGV("%s: NFA_DEACTIVATED_EVT, NFA_CE_DEACTIVATED_EVT", fn);
routingManager.notifyDeactivated(NFA_TECHNOLOGY_MASK_A);
SyncEventGuard g (gDeactivatedEvent);
gActivated = false; //guard this variable from multi-threaded access
@@ -556,7 +556,7 @@
case NFA_CE_DATA_EVT:
{
tNFA_CE_DATA& ce_data = eventData->ce_data;
- ALOGD("%s: NFA_CE_DATA_EVT; stat=0x%X; h=0x%X; data len=%u", fn, ce_data.status, ce_data.handle, ce_data.len);
+ ALOGV("%s: NFA_CE_DATA_EVT; stat=0x%X; h=0x%X; data len=%u", fn, ce_data.status, ce_data.handle, ce_data.len);
getInstance().handleData(NFA_TECHNOLOGY_MASK_A, ce_data.p_data, ce_data.len, ce_data.status);
}
break;
@@ -584,7 +584,7 @@
case NFA_EE_REGISTER_EVT:
{
SyncEventGuard guard (routingManager.mEeRegisterEvent);
- ALOGD ("%s: NFA_EE_REGISTER_EVT; status=%u", fn, eventData->ee_register);
+ ALOGV("%s: NFA_EE_REGISTER_EVT; status=%u", fn, eventData->ee_register);
routingManager.mEeRegisterEvent.notifyOne();
}
break;
@@ -592,7 +592,7 @@
case NFA_EE_MODE_SET_EVT:
{
SyncEventGuard guard (routingManager.mEeSetModeEvent);
- ALOGD ("%s: NFA_EE_MODE_SET_EVT; status: 0x%04X handle: 0x%04X ", fn,
+ ALOGV("%s: NFA_EE_MODE_SET_EVT; status: 0x%04X handle: 0x%04X ", fn,
eventData->mode_set.status, eventData->mode_set.ee_handle);
routingManager.mEeSetModeEvent.notifyOne();
}
@@ -600,7 +600,7 @@
case NFA_EE_SET_TECH_CFG_EVT:
{
- ALOGD ("%s: NFA_EE_SET_TECH_CFG_EVT; status=0x%X", fn, eventData->status);
+ ALOGV("%s: NFA_EE_SET_TECH_CFG_EVT; status=0x%X", fn, eventData->status);
SyncEventGuard guard(routingManager.mRoutingEvent);
routingManager.mRoutingEvent.notifyOne();
}
@@ -608,7 +608,7 @@
case NFA_EE_SET_PROTO_CFG_EVT:
{
- ALOGD ("%s: NFA_EE_SET_PROTO_CFG_EVT; status=0x%X", fn, eventData->status);
+ ALOGV("%s: NFA_EE_SET_PROTO_CFG_EVT; status=0x%X", fn, eventData->status);
SyncEventGuard guard(routingManager.mRoutingEvent);
routingManager.mRoutingEvent.notifyOne();
}
@@ -618,25 +618,25 @@
{
tNFA_EE_ACTION& action = eventData->action;
if (action.trigger == NFC_EE_TRIG_SELECT)
- ALOGD ("%s: NFA_EE_ACTION_EVT; h=0x%X; trigger=select (0x%X)", fn, action.ee_handle, action.trigger);
+ ALOGV("%s: NFA_EE_ACTION_EVT; h=0x%X; trigger=select (0x%X)", fn, action.ee_handle, action.trigger);
else if (action.trigger == NFC_EE_TRIG_APP_INIT)
{
tNFC_APP_INIT& app_init = action.param.app_init;
- ALOGD ("%s: NFA_EE_ACTION_EVT; h=0x%X; trigger=app-init (0x%X); aid len=%u; data len=%u", fn,
+ ALOGV("%s: NFA_EE_ACTION_EVT; h=0x%X; trigger=app-init (0x%X); aid len=%u; data len=%u", fn,
action.ee_handle, action.trigger, app_init.len_aid, app_init.len_data);
}
else if (action.trigger == NFC_EE_TRIG_RF_PROTOCOL)
- ALOGD ("%s: NFA_EE_ACTION_EVT; h=0x%X; trigger=rf protocol (0x%X)", fn, action.ee_handle, action.trigger);
+ ALOGV("%s: NFA_EE_ACTION_EVT; h=0x%X; trigger=rf protocol (0x%X)", fn, action.ee_handle, action.trigger);
else if (action.trigger == NFC_EE_TRIG_RF_TECHNOLOGY)
- ALOGD ("%s: NFA_EE_ACTION_EVT; h=0x%X; trigger=rf tech (0x%X)", fn, action.ee_handle, action.trigger);
+ ALOGV("%s: NFA_EE_ACTION_EVT; h=0x%X; trigger=rf tech (0x%X)", fn, action.ee_handle, action.trigger);
else
- ALOGE ("%s: NFA_EE_ACTION_EVT; h=0x%X; unknown trigger (0x%X)", fn, action.ee_handle, action.trigger);
+ ALOGV("%s: NFA_EE_ACTION_EVT; h=0x%X; unknown trigger (0x%X)", fn, action.ee_handle, action.trigger);
}
break;
case NFA_EE_DISCOVER_REQ_EVT:
{
- ALOGD ("%s: NFA_EE_DISCOVER_REQ_EVT; status=0x%X; num ee=%u", __func__,
+ ALOGV("%s: NFA_EE_DISCOVER_REQ_EVT; status=0x%X; num ee=%u", __func__,
eventData->discover_req.status, eventData->discover_req.num_ee);
SyncEventGuard guard (routingManager.mEeInfoEvent);
memcpy (&routingManager.mEeInfo, &eventData->discover_req, sizeof(routingManager.mEeInfo));
@@ -646,38 +646,38 @@
break;
case NFA_EE_NO_CB_ERR_EVT:
- ALOGD ("%s: NFA_EE_NO_CB_ERR_EVT status=%u", fn, eventData->status);
+ ALOGV("%s: NFA_EE_NO_CB_ERR_EVT status=%u", fn, eventData->status);
break;
case NFA_EE_ADD_AID_EVT:
{
- ALOGD ("%s: NFA_EE_ADD_AID_EVT status=%u", fn, eventData->status);
+ ALOGV("%s: NFA_EE_ADD_AID_EVT status=%u", fn, eventData->status);
}
break;
case NFA_EE_REMOVE_AID_EVT:
{
- ALOGD ("%s: NFA_EE_REMOVE_AID_EVT status=%u", fn, eventData->status);
+ ALOGV("%s: NFA_EE_REMOVE_AID_EVT status=%u", fn, eventData->status);
}
break;
case NFA_EE_NEW_EE_EVT:
{
- ALOGD ("%s: NFA_EE_NEW_EE_EVT h=0x%X; status=%u", fn,
+ ALOGV("%s: NFA_EE_NEW_EE_EVT h=0x%X; status=%u", fn,
eventData->new_ee.ee_handle, eventData->new_ee.ee_status);
}
break;
case NFA_EE_UPDATED_EVT:
{
- ALOGD("%s: NFA_EE_UPDATED_EVT", fn);
+ ALOGV("%s: NFA_EE_UPDATED_EVT", fn);
SyncEventGuard guard(routingManager.mEeUpdateEvent);
routingManager.mEeUpdateEvent.notifyOne();
}
break;
default:
- ALOGE ("%s: unknown event=%u ????", fn, event);
+ ALOGV("%s: unknown event=%u ????", fn, event);
break;
}
}
@@ -686,11 +686,11 @@
{
static const char fn [] = "RoutingManager::registerT3tIdentifier";
- ALOGD ("%s: Start to register NFC-F system on DH", fn);
+ ALOGV("%s: Start to register NFC-F system on DH", fn);
if (t3tIdLen != (2 + NCI_RF_F_UID_LEN))
{
- ALOGE ("%s: Invalid length of T3T Identifier", fn);
+ ALOGE("%s: Invalid length of T3T Identifier", fn);
return NFA_HANDLE_INVALID;
}
@@ -710,11 +710,11 @@
}
else
{
- ALOGE ("%s: Fail to register NFC-F system on DH", fn);
+ ALOGE("%s: Fail to register NFC-F system on DH", fn);
return NFA_HANDLE_INVALID;
}
- ALOGD ("%s: Succeed to register NFC-F system on DH", fn);
+ ALOGV("%s: Succeed to register NFC-F system on DH", fn);
return mNfcFOnDhHandle;
}
@@ -723,18 +723,18 @@
{
static const char fn [] = "RoutingManager::deregisterT3tIdentifier";
- ALOGD ("%s: Start to deregister NFC-F system on DH", fn);
+ ALOGV("%s: Start to deregister NFC-F system on DH", fn);
SyncEventGuard guard (mRoutingEvent);
tNFA_STATUS nfaStat = NFA_CeDeregisterFelicaSystemCodeOnDH (handle);
if (nfaStat == NFA_STATUS_OK)
{
mRoutingEvent.wait ();
- ALOGD ("%s: Succeeded in deregistering NFC-F system on DH", fn);
+ ALOGV("%s: Succeeded in deregistering NFC-F system on DH", fn);
}
else
{
- ALOGE ("%s: Fail to deregister NFC-F system on DH", fn);
+ ALOGE("%s: Fail to deregister NFC-F system on DH", fn);
}
}
@@ -743,13 +743,13 @@
static const char fn [] = "RoutingManager::nfcFCeCallback";
RoutingManager& routingManager = RoutingManager::getInstance();
- ALOGD("%s: 0x%x", __func__, event);
+ ALOGV("%s: 0x%x", __func__, event);
switch (event)
{
case NFA_CE_REGISTERED_EVT:
{
- ALOGD ("%s: registerd event notified", fn);
+ ALOGV("%s: registerd event notified", fn);
routingManager.mNfcFOnDhHandle = eventData->ce_registered.handle;
SyncEventGuard guard(routingManager.mRoutingEvent);
routingManager.mRoutingEvent.notifyOne();
@@ -757,33 +757,33 @@
break;
case NFA_CE_DEREGISTERED_EVT:
{
- ALOGD ("%s: deregisterd event notified", fn);
+ ALOGV("%s: deregisterd event notified", fn);
SyncEventGuard guard(routingManager.mRoutingEvent);
routingManager.mRoutingEvent.notifyOne();
}
break;
case NFA_CE_ACTIVATED_EVT:
{
- ALOGD ("%s: activated event notified", fn);
+ ALOGV("%s: activated event notified", fn);
routingManager.notifyActivated(NFA_TECHNOLOGY_MASK_F);
}
break;
case NFA_CE_DEACTIVATED_EVT:
{
- ALOGD ("%s: deactivated event notified", fn);
+ ALOGV("%s: deactivated event notified", fn);
routingManager.notifyDeactivated(NFA_TECHNOLOGY_MASK_F);
}
break;
case NFA_CE_DATA_EVT:
{
- ALOGD ("%s: data event notified", fn);
+ ALOGV("%s: data event notified", fn);
tNFA_CE_DATA& ce_data = eventData->ce_data;
routingManager.handleData(NFA_TECHNOLOGY_MASK_F, ce_data.p_data, ce_data.len, ce_data.status);
}
break;
default:
{
- ALOGE ("%s: unknown event=%u ????", fn, event);
+ ALOGV("%s: unknown event=%u ????", fn, event);
}
break;
}
@@ -792,7 +792,7 @@
int RoutingManager::registerJniFunctions (JNIEnv* e)
{
static const char fn [] = "RoutingManager::registerJniFunctions";
- ALOGD ("%s", fn);
+ ALOGV("%s", fn);
return jniRegisterNativeMethods (e, "com/android/nfc/cardemulation/AidRoutingManager", sMethods, NELEM(sMethods));
}
diff --git a/nci/jni/extns/pn54x/src/log/phNxpLog.c b/nci/jni/extns/pn54x/src/log/phNxpLog.c
index 15b1d20..85d1776 100755
--- a/nci/jni/extns/pn54x/src/log/phNxpLog.c
+++ b/nci/jni/extns/pn54x/src/log/phNxpLog.c
@@ -260,7 +260,7 @@
phNxpLog_SetDnldLogLevel (level);
phNxpLog_SetNciTxLogLevel (level);
- ALOGD ("%s: global =%u, Fwdnld =%u, extns =%u, \
+ ALOGV("%s: global =%u, Fwdnld =%u, extns =%u, \
hal =%u, tml =%u, ncir =%u, \
ncix =%u", \
__func__, gLog_level.global_log_level, gLog_level.dnld_log_level,
diff --git a/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.c b/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.c
index 162196a..6696170 100755
--- a/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.c
+++ b/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.c
@@ -610,8 +610,8 @@
gphNxpExtns_Context.CallBackCtxt = NdefMap;
for (id = 0; id < len; id++)
{
- ALOGD("secrtkey[%d] = 0x%x", id, secrtkey[id]);
- ALOGD("mif_secrete_key[%d] = 0x%x", id, mif_secrete_key[id]);
+ ALOGV("secrtkey[%d] = 0x%x", id, secrtkey[id]);
+ ALOGV("mif_secrete_key[%d] = 0x%x", id, mif_secrete_key[id]);
}
/* Set Completion Routine for ReadNdef */
NdefMap->CompletionRoutine[0].CompletionRoutine = Mfc_SetRdOnly_Completion_Routine;
@@ -1421,7 +1421,7 @@
status = phNciNfc_RecvMfResp(&RspBuff, status);
if (true == gAuthCmdBuf.auth_sent)
{
- ALOGD("%s Mfc Check Presence in progress", __func__);
+ ALOGV("%s Mfc Check Presence in progress", __func__);
gAuthCmdBuf.auth_sent = false;
return status;
}
diff --git a/nci/jni/extns/pn54x/src/phNxpExtns.c b/nci/jni/extns/pn54x/src/phNxpExtns.c
index 1c2afdc..a009bdc 100755
--- a/nci/jni/extns/pn54x/src/phNxpExtns.c
+++ b/nci/jni/extns/pn54x/src/phNxpExtns.c
@@ -230,7 +230,7 @@
gAuthCmdBuf.status = NFCSTATUS_FAILED;
if (sem_init (&gAuthCmdBuf.semPresenceCheck, 0, 0) == -1)
{
- ALOGE ("%s: semaphore creation failed (errno=%d)", __func__, errno);
+ ALOGE("%s: semaphore creation failed (errno=%d)", __func__, errno);
return NFCSTATUS_FAILED;
}
@@ -629,14 +629,14 @@
if (sem_timedwait (&gAuthCmdBuf.semPresenceCheck, &ts))
{
- ALOGE ("%s: failed to wait (errno=%d)", __func__, errno);
+ ALOGE("%s: failed to wait (errno=%d)", __func__, errno);
sem_destroy (&gAuthCmdBuf.semPresenceCheck);
gAuthCmdBuf.auth_sent = false;
return NFCSTATUS_FAILED;
}
if (sem_destroy (&gAuthCmdBuf.semPresenceCheck))
{
- ALOGE ("%s: Failed to destroy check Presence semaphore (errno=%d)", __func__, errno);
+ ALOGE("%s: Failed to destroy check Presence semaphore (errno=%d)", __func__, errno);
}
return gAuthCmdBuf.status;
}
diff --git a/nci/jni/extns/pn54x/src/utils/phNxpConfig.cpp b/nci/jni/extns/pn54x/src/utils/phNxpConfig.cpp
index ed55a23..dbca917 100755
--- a/nci/jni/extns/pn54x/src/utils/phNxpConfig.cpp
+++ b/nci/jni/extns/pn54x/src/utils/phNxpConfig.cpp
@@ -216,10 +216,10 @@
/* open config file, read it into a buffer */
if ((fd = fopen (name, "rb")) == NULL)
{
- ALOGE ("%s Cannot open config file %s", __func__, name);
+ ALOGE("%s Cannot open config file %s", __func__, name);
if (bResetContent)
{
- ALOGE ("%s Using default value for all settings", __func__);
+ ALOGE("%s Using default value for all settings", __func__);
mValidFile = false;
}
return false;
@@ -718,7 +718,7 @@
if (stat(config_timestamp_path, &st) != 0)
{
- ALOGD ("%s file %s not exist, creat it.", __func__, config_timestamp_path);
+ ALOGV("%s file %s not exist, creat it.", __func__, config_timestamp_path);
if ((fd = fopen (config_timestamp_path, "w+")) != NULL)
{
fwrite (&m_timeStamp, sizeof(unsigned long), 1, fd);
@@ -731,7 +731,7 @@
fd = fopen (config_timestamp_path, "r+");
if (fd == NULL)
{
- ALOGE ("%s Cannot open file %s", __func__, config_timestamp_path);
+ ALOGE("%s Cannot open file %s", __func__, config_timestamp_path);
return 1;
}
diff --git a/src/com/android/nfc/NfcDispatcher.java b/src/com/android/nfc/NfcDispatcher.java
index 0a38c59..f881462 100644
--- a/src/com/android/nfc/NfcDispatcher.java
+++ b/src/com/android/nfc/NfcDispatcher.java
@@ -88,7 +88,8 @@
NfcDispatcher(Context context,
HandoverDataParser handoverDataParser,
- boolean provisionOnly) {
+ boolean provisionOnly,
+ boolean isLiveCaseEnabled) {
mContext = context;
mIActivityManager = ActivityManagerNative.getDefault();
mTechListFilters = new RegisteredComponentCache(mContext,
@@ -115,12 +116,14 @@
mProvisioningMimes = provisionMimes;
String[] liveCaseMimes = null;
- try {
- // Get accepted mime-types
- liveCaseMimes = context.getResources().
- getStringArray(R.array.live_case_mime_types);
- } catch (NotFoundException e) {
- liveCaseMimes = null;
+ if (isLiveCaseEnabled) {
+ try {
+ // Get accepted mime-types
+ liveCaseMimes = context.getResources().
+ getStringArray(R.array.live_case_mime_types);
+ } catch (NotFoundException e) {
+ liveCaseMimes = null;
+ }
}
mLiveCaseMimes = liveCaseMimes;
}
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 770b59e..8aafd2a 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -393,7 +393,8 @@
mInProvisionMode = false;
}
- mNfcDispatcher = new NfcDispatcher(mContext, mHandoverDataParser, mInProvisionMode);
+ mNfcDispatcher = new NfcDispatcher(mContext, mHandoverDataParser, mInProvisionMode,
+ mIsLiveCaseEnabled);
mP2pLinkManager = new P2pLinkManager(mContext, mHandoverDataParser,
mDeviceHost.getDefaultLlcpMiu(), mDeviceHost.getDefaultLlcpRwSize());
