diff options
| author | Evan Chu <evanchu@broadcom.com> | 2012-10-16 10:50:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-16 10:50:29 -0700 |
| commit | 14a35342da905cffaf8a818a6354327fb77a532d (patch) | |
| tree | 9f5da1c60a01d2345c00a9ab2c28e40d03c1e7f4 | |
| parent | 81aa9898af2f99506cb025e9d8e37252d80c42fa (diff) | |
| parent | a15b24e9e405b65b7523d8c80173b1c0d71e093e (diff) | |
| download | packages_apps_nfc-14a35342da905cffaf8a818a6354327fb77a532d.zip packages_apps_nfc-14a35342da905cffaf8a818a6354327fb77a532d.tar.gz packages_apps_nfc-14a35342da905cffaf8a818a6354327fb77a532d.tar.bz2 | |
am a15b24e9: Check for invalid handle before configuring secure element.
* commit 'a15b24e9e405b65b7523d8c80173b1c0d71e093e':
Check for invalid handle before configuring secure element.
| -rw-r--r-- | nci/jni/PeerToPeer.cpp | 2 | ||||
| -rwxr-xr-x | nci/jni/SecureElement.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/nci/jni/PeerToPeer.cpp b/nci/jni/PeerToPeer.cpp index 13b5a60..7994e2a 100644 --- a/nci/jni/PeerToPeer.cpp +++ b/nci/jni/PeerToPeer.cpp @@ -1590,7 +1590,7 @@ bool P2pServer::registerWithStack() - Data link connection timeout (LLCP_DATA_LINK_CONNECTION_TOUT) - Delay timeout to send first PDU as initiator (LLCP_DELAY_TIME_TO_SEND_FIRST_PDU) ************************/ - stat = NFA_P2pSetLLCPConfig (LLCP_MIU, + stat = NFA_P2pSetLLCPConfig (LLCP_MAX_MIU, LLCP_OPT_VALUE, LLCP_WAITING_TIME, LLCP_LTO_VALUE, diff --git a/nci/jni/SecureElement.cpp b/nci/jni/SecureElement.cpp index f6b2721..6c52030 100755 --- a/nci/jni/SecureElement.cpp +++ b/nci/jni/SecureElement.cpp @@ -2129,6 +2129,7 @@ bool SecureElement::routeToDefault () tNFA_STATUS nfaStat = NFA_STATUS_FAILED; bool retval = false; + ALOGD ("%s: enter", fn); if (! mIsInit) { ALOGE ("%s: not init", fn); @@ -2141,6 +2142,7 @@ bool SecureElement::routeToDefault () return true; } + if (mActiveEeHandle != NFA_HANDLE_INVALID) { ALOGD ("%s: stop UICC listen; EE h=0x%X", fn, mActiveEeHandle); SyncEventGuard guard (mUiccListenEvent); @@ -2153,6 +2155,8 @@ bool SecureElement::routeToDefault () else ALOGE ("%s: fail to stop UICC listen", fn); } + else + retval = true; adjustRoutes (DefaultRoute); |