commit 67d9f856bdf864229690c7d00300b9441a5360ea
author The Android Automerger <android-build@android.com> Wed Jun 13 08:30:50 2012 -0700
committer The Android Automerger <android-build@android.com> Wed Jun 13 08:30:50 2012 -0700
tree 0e6ced767bf7fd0b582a76d44694ad7946f83c30
parent 144d72d32ae420d5f4b25897a43210f56e287637
parent cd4cc50890774766ee548a87fb8235d4d9a07eba

merge in jb-release history after reset to jb-dev

Linux_x86/phOsalNfc.c

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_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");
     }
 }