From c3bdf1b8befc4ab473e598f750708e6da74bbaf8 Mon Sep 17 00:00:00 2001 From: ubuntu Date: Tue, 10 Oct 2017 16:55:38 +0530 Subject: AC trigger observed in SPAY payment transaction FIx: Avoid sending mode set off command during NFC off when SPI session is still active --- nci/jni/SecureElement.cpp | 4 ++++ 1 file changed, 4 insertions(+) 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() && -- cgit v1.2.3