diff options
| author | suraj <suraj.uday.kotharkar@nxp.com> | 2017-09-15 17:34:58 +0530 |
|---|---|---|
| committer | nxpandroid <srikrishna.pramoda@nxp.com> | 2017-09-26 11:58:39 +0530 |
| commit | 08cbb6bd0abb97d64cdb2ebf35f547d02f458fa1 (patch) | |
| tree | e930c62eff284490d7a818546db8a483e1da090d | |
| parent | fb29951e170dc3e7115dc1cbc183a65a21b137cc (diff) | |
| download | android_vendor_nxp_opensource_packages_apps_Nfc-08cbb6bd0abb97d64cdb2ebf35f547d02f458fa1.tar.gz android_vendor_nxp_opensource_packages_apps_Nfc-08cbb6bd0abb97d64cdb2ebf35f547d02f458fa1.tar.bz2 android_vendor_nxp_opensource_packages_apps_Nfc-08cbb6bd0abb97d64cdb2ebf35f547d02f458fa1.zip | |
Adding missing changes for init failure.
| -rw-r--r-- | nci/jni/RoutingManager.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/nci/jni/RoutingManager.cpp b/nci/jni/RoutingManager.cpp index 83df3bee..06c1215b 100644 --- a/nci/jni/RoutingManager.cpp +++ b/nci/jni/RoutingManager.cpp @@ -800,9 +800,16 @@ void RoutingManager::setCeRouteStrictDisable(uint32_t state) ********************************************************************************/ void RoutingManager::nfaEEConnect() { - if(NFA_STATUS_OK == NFA_EeConnect(EE_HCI_DEFAULT_HANDLE, - NFC_NFCEE_INTERFACE_HCI_ACCESS, - nfaEeCallback)) + tNFA_STATUS nfaStat = NFA_STATUS_FAILED; + if(NFA_GetNCIVersion() != NCI_VERSION_2_0) + { + nfaStat = NFA_EeConnect(EE_HCI_DEFAULT_HANDLE, NFC_NFCEE_INTERFACE_HCI_ACCESS, nfaEeCallback); + } + else + { + nfaStat = NFA_EeDiscover(nfaEeCallback); + } + if(nfaStat == NFA_STATUS_OK) { SyncEventGuard g(gNfceeDiscCbEvent); ALOGV("%s, Sem wait for gNfceeDiscCbEvent %d", __FUNCTION__, gdisc_timeout); |