diff options
author | Evan Chu <evanchu@broadcom.com> | 2012-10-16 10:50:30 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-16 10:50:30 -0700 |
commit | 47dbe9f2bcc03107adf2be32864d81e192451d71 (patch) | |
tree | ddebf3b7cd14d90b2d3905027d6de97b88953199 | |
parent | 14a35342da905cffaf8a818a6354327fb77a532d (diff) | |
parent | 547b58f41866671e0028ed6f395b34e271ce81b1 (diff) | |
download | packages_apps_nfc-47dbe9f2bcc03107adf2be32864d81e192451d71.zip packages_apps_nfc-47dbe9f2bcc03107adf2be32864d81e192451d71.tar.gz packages_apps_nfc-47dbe9f2bcc03107adf2be32864d81e192451d71.tar.bz2 |
am 547b58f4: Fix tag not deactivating to sleep during reconnect.
* commit '547b58f41866671e0028ed6f395b34e271ce81b1':
Fix tag not deactivating to sleep during reconnect.
-rwxr-xr-x | nci/jni/NativeNfcManager.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp index 814f49b..f15c92f 100755 --- a/nci/jni/NativeNfcManager.cpp +++ b/nci/jni/NativeNfcManager.cpp @@ -339,16 +339,17 @@ static void nfaConnectionCallback (UINT8 connEvent, tNFA_CONN_EVT_DATA* eventDat case NFA_DEACTIVATED_EVT: // NFC link/protocol deactivated ALOGD("%s: NFA_DEACTIVATED_EVT Type: %u, gIsTagDeactivating: %d", __FUNCTION__, eventData->deactivated.type,gIsTagDeactivating); NfcTag::getInstance().setDeactivationState (eventData->deactivated); - if (gIsTagDeactivating || gIsSelectingRfInterface) + if (eventData->deactivated.type != NFA_DEACTIVATE_TYPE_SLEEP) { - if (gIsTagDeactivating) - nativeNfcTag_doDeactivateStatus(0); - break; + nativeNfcTag_resetPresenceCheck(); + NfcTag::getInstance().connectionEventHandler (connEvent, eventData); + nativeNfcTag_abortWaits(); + NfcTag::getInstance().abort (); + } + else if (gIsTagDeactivating) + { + nativeNfcTag_doDeactivateStatus(0); } - nativeNfcTag_resetPresenceCheck(); - NfcTag::getInstance().connectionEventHandler (connEvent, eventData); - nativeNfcTag_abortWaits(); - NfcTag::getInstance().abort (); // If RF is activated for what we think is a Secure Element transaction // and it is deactivated to either IDLE or DISCOVERY mode, notify w/event. |