aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsuraj <suraj.uday.kotharkar@nxp.com>2017-09-15 16:50:07 +0530
committernxpandroid <srikrishna.pramoda@nxp.com>2017-09-26 11:56:24 +0530
commitfb29951e170dc3e7115dc1cbc183a65a21b137cc (patch)
tree2732048d18affdaa191c3a968abc103b0ceea679
parent3f2a91f92c3f965634789eda19fb32d69a1999b8 (diff)
downloadandroid_vendor_nxp_opensource_packages_apps_Nfc-fb29951e170dc3e7115dc1cbc183a65a21b137cc.tar.gz
android_vendor_nxp_opensource_packages_apps_Nfc-fb29951e170dc3e7115dc1cbc183a65a21b137cc.tar.bz2
android_vendor_nxp_opensource_packages_apps_Nfc-fb29951e170dc3e7115dc1cbc183a65a21b137cc.zip
Adding missing changes.
-rwxr-xr-xnci/jni/NativeNfcManager.cpp1
-rw-r--r--nci/jni/RoutingManager.cpp3
2 files changed, 1 insertions, 3 deletions
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp
index 91d1feea..b221d8c2 100755
--- a/nci/jni/NativeNfcManager.cpp
+++ b/nci/jni/NativeNfcManager.cpp
@@ -540,7 +540,6 @@ void *enableThread(void *arg);
static IntervalTimer scleanupTimerProc_transaction;
static bool gIsDtaEnabled=false;
-tNfc_featureList nfcFL;
static void nfcManager_getFeatureList();
static void register_signal_handler();
/////////////////////////////////////////////////////////////
diff --git a/nci/jni/RoutingManager.cpp b/nci/jni/RoutingManager.cpp
index 97b0524d..83df3bee 100644
--- a/nci/jni/RoutingManager.cpp
+++ b/nci/jni/RoutingManager.cpp
@@ -2450,7 +2450,7 @@ void RoutingManager::nfaEeCallback (tNFA_EE_EVT event, tNFA_EE_CBACK_DATA* event
se.mPwrLinkCtrlEvent.notifyOne();
}
break;
-
+#endif
case NFA_EE_SET_TECH_CFG_EVT:
{
ALOGV("%s: NFA_EE_SET_TECH_CFG_EVT; status=0x%X", fn, eventData->status);
@@ -3072,7 +3072,6 @@ void *ee_removed_ntf_handler_thread(void *data)
ALOGV("%s: power link command failed", __func__);
}
}
-#endif
stat = NFA_EeModeSet(SecureElement::EE_HANDLE_0xF3, NFA_EE_MD_DEACTIVATE);
if(stat == NFA_STATUS_OK)