summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2012-06-12 12:46:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-12 12:46:19 -0700
commit55d095b160d7e11c5061e213ae2e1f365f556745 (patch)
tree0e6ced767bf7fd0b582a76d44694ad7946f83c30
parentc4f816eaa812220a5f0d944bac3949b50b9cf5a5 (diff)
parent144d72d32ae420d5f4b25897a43210f56e287637 (diff)
downloadexternal_libnfc-nxp-55d095b160d7e11c5061e213ae2e1f365f556745.zip
external_libnfc-nxp-55d095b160d7e11c5061e213ae2e1f365f556745.tar.gz
external_libnfc-nxp-55d095b160d7e11c5061e213ae2e1f365f556745.tar.bz2
am 144d72d3: Remove some logs in case of abort() (DO NOT MERGE).
* commit '144d72d32ae420d5f4b25897a43210f56e287637': Remove some logs in case of abort() (DO NOT MERGE).
-rw-r--r--Linux_x86/phOsalNfc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/Linux_x86/phOsalNfc.c b/Linux_x86/phOsalNfc.c
index 83b4e6e..a158415 100644
--- a/Linux_x86/phOsalNfc.c
+++ b/Linux_x86/phOsalNfc.c
@@ -142,14 +142,12 @@ void phOsalNfc_DbgTrace(uint8_t data[], uint32_t size)
*/
void phOsalNfc_RaiseException(phOsalNfc_ExceptionType_t eExceptionType, uint16_t reason)
{
- ALOGD("phOsalNfc_RaiseException() called");
-
if(eExceptionType == phOsalNfc_e_UnrecovFirmwareErr)
{
- ALOGE("HCI Timeout - Exception raised");
phLibNfc_Mgt_Recovery();
- ALOGE("Force restart of NFC Service");
abort();
+ } else {
+ ALOGD("phOsalNfc_RaiseException() called");
}
}