commit 601c474b5d1b83216a9a06ee258ff945162eca53
author nxpandroid <srikrishna.pramoda@nxp.com> Wed Sep 13 16:10:30 2017 +0530
committer nxpandroid <srikrishna.pramoda@nxp.com> Wed Sep 13 16:10:30 2017 +0530
tree bd8696a757b1f90b70ceb240165e6c8f984e368d
parent fb16096ab231e22ecb43a3a3be26cc99f4370556

[EMPTY_AID] : Replace ISO7816 proto routing to EMPTY AID routing

src/nfa/ee/nfa_ee_api.c

diff --git a/src/nfa/ee/nfa_ee_api.c b/src/nfa/ee/nfa_ee_api.c
index 5c945db..0768366 100644
--- a/src/nfa/ee/nfa_ee_api.c
+++ b/src/nfa/ee/nfa_ee_api.c
@@ -583,19 +583,22 @@
   uint16_t size = sizeof(tNFA_EE_API_ADD_AID) + aid_len;
   uint8_t nfcee_id = (uint8_t)(ee_handle & 0xFF);
   tNFA_EE_ECB* p_cb;
-
   NFA_TRACE_API1("NFA_EeAddAidRouting(): handle:<0x%x>", ee_handle);
   p_cb = nfa_ee_find_ecb(nfcee_id);
 
   /* validate parameters - make sure the AID is in valid length range */
-  if ((p_cb == NULL) || (aid_len == 0) || (p_aid == NULL) ||
-      (aid_len < NFA_MIN_AID_LEN) || (aid_len > NFA_MAX_AID_LEN)) {
+  if ((p_cb == NULL) || ((NFA_GetNCIVersion() == NCI_VERSION_2_0) && (aid_len != 0) && (p_aid == NULL)) ||
+          ((NFA_GetNCIVersion() != NCI_VERSION_2_0) &&
+                  ((aid_len == 0) || (p_aid == NULL) || (aid_len < NFA_MIN_AID_LEN))) ||
+                  (aid_len > NFA_MAX_AID_LEN)) {
     NFA_TRACE_ERROR1("Bad ee_handle or AID (len=%d)", aid_len);
     status = NFA_STATUS_INVALID_PARAM;
   } else {
     p_msg = (tNFA_EE_API_ADD_AID*)GKI_getbuf(size);
     if (p_msg != NULL) {
-      NFA_TRACE_DEBUG2("aid:<%02x%02x>", p_aid[0], p_aid[1]);
+        if(p_aid != NULL) {
+            NFA_TRACE_DEBUG2("aid:<%02x%02x>", p_aid[0], p_aid[1]);
+        }
       p_msg->hdr.event = NFA_EE_API_ADD_AID_EVT;
       p_msg->nfcee_id = nfcee_id;
       p_msg->p_cb = p_cb;
@@ -605,8 +608,9 @@
 #if (NXP_EXTNS == TRUE)
       p_msg->aid_info = aidInfo;
 #endif
+      if(p_aid != NULL) {
       memcpy(p_msg->p_aid, p_aid, aid_len);
-
+      }
       nfa_sys_sendmsg(p_msg);
 
       status = NFA_STATUS_OK;