aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorubuntu <shashank.vimal@nxp.com>2017-10-10 16:55:38 +0530
committernxpandroid <srikrishna.pramoda@nxp.com>2017-10-16 15:15:17 +0530
commitc3bdf1b8befc4ab473e598f750708e6da74bbaf8 (patch)
treeae0954c3839dd354561662f591796dc7088e7a8e
parent9294ce089fff8d0f595d9c3a06ec2a5a6d474825 (diff)
downloadandroid_vendor_nxp_opensource_packages_apps_Nfc-c3bdf1b8befc4ab473e598f750708e6da74bbaf8.tar.gz
android_vendor_nxp_opensource_packages_apps_Nfc-c3bdf1b8befc4ab473e598f750708e6da74bbaf8.tar.bz2
android_vendor_nxp_opensource_packages_apps_Nfc-c3bdf1b8befc4ab473e598f750708e6da74bbaf8.zip
AC trigger observed in SPAY payment transaction
FIx: Avoid sending mode set off command during NFC off when SPI session is still active
-rw-r--r--nci/jni/SecureElement.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/nci/jni/SecureElement.cpp b/nci/jni/SecureElement.cpp
index d7037482..26184488 100644
--- a/nci/jni/SecureElement.cpp
+++ b/nci/jni/SecureElement.cpp
@@ -4748,6 +4748,10 @@ tNFA_STATUS SecureElement::SecElem_EeModeSet(uint16_t handle, uint8_t mode)
sSecElem.mResetEvent.wait();
}
}
+ if((dual_mode_current_state & SPI_ON) && (handle == EE_HANDLE_0xF3) &&
+ (mode == NFA_EE_MD_DEACTIVATE))
+ return NFA_STATUS_OK;
+
SyncEventGuard guard (sSecElem.mEeSetModeEvent);
stat = NFA_EeModeSet(handle, mode);
if(stat == NFA_STATUS_OK && !android::nfcManager_isNfcDisabling() &&