summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nci/jni/PeerToPeer.cpp2
-rwxr-xr-xnci/jni/SecureElement.cpp4
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);