diff options
| author | Martijn Coenen <maco@google.com> | 2012-10-01 14:03:59 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-01 14:03:59 -0700 |
| commit | 7379fb73a8e88720977604d62983706b3c4391bf (patch) | |
| tree | 6da05ebad736ee281cc26eaf8fd2e2928e28948a | |
| parent | 43727fbb7cc3b799a46c3d6ddeff24dd83081449 (diff) | |
| parent | e8f4eba219835c4c46af6be49a25f96679aea864 (diff) | |
| download | packages_apps_nfc-7379fb73a8e88720977604d62983706b3c4391bf.zip packages_apps_nfc-7379fb73a8e88720977604d62983706b3c4391bf.tar.gz packages_apps_nfc-7379fb73a8e88720977604d62983706b3c4391bf.tar.bz2 | |
Merge "Fix native crash during RF field notifications." into jb-broadcom-nfc
| -rwxr-xr-x | nci/jni/NativeNfcManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp index 4ff03f7..6625842 100755 --- a/nci/jni/NativeNfcManager.cpp +++ b/nci/jni/NativeNfcManager.cpp @@ -571,7 +571,7 @@ void nfaDeviceManagementCallback (UINT8 dmEvent, tNFA_DM_CBACK_DATA* eventData) ALOGD ("%s: NFA_DM_RF_FIELD_EVT; status=0x%X; field status=%u", __FUNCTION__, eventData->rf_field.status, eventData->rf_field.rf_field_status); - if (eventData->rf_field.status == NFA_STATUS_OK) + if (!sIsDisabling && eventData->rf_field.status == NFA_STATUS_OK) SecureElement::getInstance().notifyRfFieldEvent (eventData->rf_field.rf_field_status == NFA_DM_RF_FIELD_ON); break; |