summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2011-01-04 18:04:06 +1100
committerNick Pelly <npelly@google.com>2011-01-11 15:39:56 -0800
commit78f4485d27a7630534b2b28f24ab9d0190a2e642 (patch)
tree62ce557ce01605c1accce935f0da14ba69b7a2af
parent325757574e3fdca117f89c84d6db1766d8160b2a (diff)
downloadlibnfc-nxp-78f4485d27a7630534b2b28f24ab9d0190a2e642.tar.gz
Fix bugs related to SE+P2P co-exisitance.
Source: Patrice @ NXP Change-Id: I9437a2c2798ffe7ea34f3f18df097d0036310568
-rw-r--r--src/phLibNfc_SE.c19
1 files changed, 17 insertions, 2 deletions
diff --git a/src/phLibNfc_SE.c b/src/phLibNfc_SE.c
index 2361a87..42334d8 100644
--- a/src/phLibNfc_SE.c
+++ b/src/phLibNfc_SE.c
@@ -172,12 +172,18 @@ STATIC void phLibNfc_SeNotification(void *context,
{
case NFC_EVT_TRANSACTION:
{
- if(pEvtInfo->eventInfo.aid.length != 0)
+ if((pEvtInfo->eventInfo.aid.length != 0) && ((pEvtInfo->eventInfo.aid.length <= 16))) // PLG
{
/*copy the Application id on which transaction happened*/
Se_Trans_Info.UiccEvtInfo.aid.buffer =pEvtInfo->eventInfo.aid.buffer;
Se_Trans_Info.UiccEvtInfo.aid.length =pEvtInfo->eventInfo.aid.length;
}
+ else
+ {
+ // PLG patch
+ Se_Trans_Info.UiccEvtInfo.aid.buffer = NULL;
+ Se_Trans_Info.UiccEvtInfo.aid.length = 0;
+ }
if((pEvtInfo->eventHost == phHal_eUICCHost)
&& (info.psEventInfo->eventInfo.uicc_info.param.length
!= 0))
@@ -218,7 +224,16 @@ STATIC void phLibNfc_SeNotification(void *context,
status);
break;
}
- case NFC_EVT_START_OF_TRANSACTION:
+ case NFC_EVT_START_OF_TRANSACTION: // PLG ++
+
+ (*pLibContext->sSeContext.sSeCallabackInfo.pSeListenerNtfCb)(
+ pLibContext->sSeContext.sSeCallabackInfo.pSeListenerCtxt,
+ phLibNfc_eSE_EvtTypeTransaction,
+ pSeInfo->hSecureElement,
+ &Se_Trans_Info,
+ status);
+
+ break; // PLG --
default:
{
break;