diff options
| author | Evan Chu <evanchu@broadcom.com> | 2012-09-30 21:55:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-30 21:55:47 -0700 |
| commit | 1d79d84ba427b6cd2bfdd5b8b9a411847ad01d43 (patch) | |
| tree | d20d3efa7a1b86f6f0532c4332f2245630f2067d | |
| parent | bdcdfc49616995d4e2a90521c22eac6eb909f88c (diff) | |
| parent | a80bb9a5333d4f4f749778f3a7b13b8c7ae58c6f (diff) | |
| download | packages_apps_nfc-1d79d84ba427b6cd2bfdd5b8b9a411847ad01d43.zip packages_apps_nfc-1d79d84ba427b6cd2bfdd5b8b9a411847ad01d43.tar.gz packages_apps_nfc-1d79d84ba427b6cd2bfdd5b8b9a411847ad01d43.tar.bz2 | |
am a80bb9a5: Do not activate a tag during NFC disable.
* commit 'a80bb9a5333d4f4f749778f3a7b13b8c7ae58c6f':
Do not activate a tag during NFC disable.
| -rwxr-xr-x | nci/jni/NativeNfcManager.cpp | 10 | ||||
| -rw-r--r-- | nci/jni/RouteDataSet.h | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp index 99ffc77..e65e30e 100755 --- a/nci/jni/NativeNfcManager.cpp +++ b/nci/jni/NativeNfcManager.cpp @@ -267,7 +267,10 @@ static void nfaConnectionCallback (UINT8 connEvent, tNFA_CONN_EVT_DATA* eventDat break; case NFA_SELECT_RESULT_EVT: // NFC link/protocol discovery select response - ALOGD("%s: NFA_SELECT_RESULT_EVT: status = %d, gIsSelectingRfInterface = %d", __FUNCTION__, eventData->status, gIsSelectingRfInterface); + ALOGD("%s: NFA_SELECT_RESULT_EVT: status = %d, gIsSelectingRfInterface = %d, sIsDisabling=%d", __FUNCTION__, eventData->status, gIsSelectingRfInterface, sIsDisabling); + + if (sIsDisabling) + break; if (eventData->status != NFA_STATUS_OK) { @@ -286,7 +289,10 @@ static void nfaConnectionCallback (UINT8 connEvent, tNFA_CONN_EVT_DATA* eventDat break; case NFA_ACTIVATED_EVT: // NFC link/protocol activated - ALOGD("%s: NFA_ACTIVATED_EVT: gIsSelectingRfInterface=%d", __FUNCTION__, gIsSelectingRfInterface); + ALOGD("%s: NFA_ACTIVATED_EVT: gIsSelectingRfInterface=%d, sIsDisabling=%d", __FUNCTION__, gIsSelectingRfInterface, sIsDisabling); + if (sIsDisabling) + break; + NfcTag::getInstance().setActivationState (); if (gIsSelectingRfInterface) { diff --git a/nci/jni/RouteDataSet.h b/nci/jni/RouteDataSet.h index d937dec..d2a09b8 100644 --- a/nci/jni/RouteDataSet.h +++ b/nci/jni/RouteDataSet.h @@ -152,7 +152,7 @@ private: ** Name: RouteDataSet ** ** Description: Import and export general routing data using a XML file. -** See /data/bcmnfc/param/route.xml +** See /data/bcm/param/route.xml ** *****************************************************************************/ class RouteDataSet |