diff options
| author | Manjunatha Venkatesh <manjunatha.venkatesh@nxp.com> | 2017-10-31 18:25:18 +0530 |
|---|---|---|
| committer | nxpandroid <srikrishna.pramoda@nxp.com> | 2017-11-16 09:36:40 +0530 |
| commit | 2af0fa35547ad20b5a2f33c8f2bfb7b73efc3b5d (patch) | |
| tree | c3975ad12cbffe4d751e54fad2ef839e4ce8c308 | |
| parent | e84753c3361e1f3ee68d7b42a68b98974dff043e (diff) | |
| download | android_vendor_nxp_opensource_packages_apps_Nfc-2af0fa35547ad20b5a2f33c8f2bfb7b73efc3b5d.tar.gz android_vendor_nxp_opensource_packages_apps_Nfc-2af0fa35547ad20b5a2f33c8f2bfb7b73efc3b5d.tar.bz2 android_vendor_nxp_opensource_packages_apps_Nfc-2af0fa35547ad20b5a2f33c8f2bfb7b73efc3b5d.zip | |
Jcop download failed on DWP interface.
During Jcop download Jcop download protection macro handled properly and jcop download
deinit issue identified run time.
| -rw-r--r-- | nci/jni/Android.mk | 1 | ||||
| -rw-r--r-- | nci/jni/JcopManager.cpp | 2 | ||||
| -rwxr-xr-x | nci/jni/NativeNfcManager.cpp | 12 |
3 files changed, 8 insertions, 7 deletions
diff --git a/nci/jni/Android.mk b/nci/jni/Android.mk index 0c87dee2..ab8e6631 100644 --- a/nci/jni/Android.mk +++ b/nci/jni/Android.mk @@ -35,6 +35,7 @@ LOCAL_SRC_FILES := $(call all-subdir-cpp-files) $(call all-subdir-c-files) LOCAL_C_INCLUDES += \ frameworks/native/include \ + libnativehelper/include/nativehelper \ $(NFA)/include \ $(NFA)/brcm \ $(NFC)/include \ diff --git a/nci/jni/JcopManager.cpp b/nci/jni/JcopManager.cpp index e5ddb7d5..4181e4e1 100644 --- a/nci/jni/JcopManager.cpp +++ b/nci/jni/JcopManager.cpp @@ -159,7 +159,7 @@ tNFA_STATUS JcopManager::JcopInitialize () ALOGE("%s: Error while linking JCOP context (JCDNLD_StartDownload) !!", __func__); } // Getting pointer to JCDNLD_DeInit function - if((pg_mPhJcpCtxt->ala_deinit = (tJCOP_DEINIT_CBACK *)dlsym(Pgpx_Jcop_handle, "JCDNLD_DeInit")) == NULL){ + if((pg_mPhJcpCtxt->jcdnld_deinit = (tJCOP_DEINIT_CBACK *)dlsym(Pgpx_Jcop_handle, "JCDNLD_DeInit")) == NULL){ wStatus = NFA_STATUS_FAILED; ALOGE("%s: Error while linking JCOP context (JCDNLD_DeInit) !!", __func__); } diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp index 4a857626..d15f7254 100755 --- a/nci/jni/NativeNfcManager.cpp +++ b/nci/jni/NativeNfcManager.cpp @@ -5574,14 +5574,14 @@ static int nfcManager_doJcosDownload(JNIEnv* e, jobject o) if(nfcFL.nfcNxpEse) { ALOGV("%s: enter", __func__); bool stat = false; + int ret_val = -1; + NFCSTATUS ese_status = NFA_STATUS_FAILED; + p61_access_state_t p61_current_state = P61_STATE_INVALID; + eScreenState_t last_screen_state_request = get_lastScreenStateRequest(); SecureElement &se = SecureElement::getInstance(); if(nfcFL.eseFL._ESE_JCOP_DWNLD_PROTECTION) { - int ret_val = -1; - NFCSTATUS ese_status = NFA_STATUS_FAILED; - p61_access_state_t p61_current_state = P61_STATE_INVALID; - eScreenState_t last_screen_state_request = get_lastScreenStateRequest(); if (sIsDisabling || !sIsNfaEnabled || nfcManager_checkNfcStateBusy()) { @@ -5626,6 +5626,8 @@ static int nfcManager_doJcosDownload(JNIEnv* e, jobject o) return NFA_STATUS_FAILED; } } + } + } if (sRfEnabled) { // Stop RF Discovery if we were polling startRfDiscovery (false); @@ -5667,8 +5669,6 @@ static int nfcManager_doJcosDownload(JNIEnv* e, jobject o) nfcManager_doSetScreenState(NULL,NULL,last_screen_state_request); } } - } - } startRfDiscovery (true); se.mDownloadMode = NONE; ALOGV("%s: exit; status =0x%X", __func__,status); |