summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2012-10-01 12:13:56 -0700
committerMartijn Coenen <maco@google.com>2012-10-01 12:13:56 -0700
commite8f4eba219835c4c46af6be49a25f96679aea864 (patch)
treecd7acca1fabe38d4631511850db3d9c558f90998
parent914d6caa70f544fb3dd0710de59dff090c695caa (diff)
downloadpackages_apps_nfc-e8f4eba219835c4c46af6be49a25f96679aea864.zip
packages_apps_nfc-e8f4eba219835c4c46af6be49a25f96679aea864.tar.gz
packages_apps_nfc-e8f4eba219835c4c46af6be49a25f96679aea864.tar.bz2
Fix native crash during RF field notifications.
Bug: 7264008 Change-Id: I2647b0c6adf8f95e21d9f789c411742aef19c5ad
-rwxr-xr-xnci/jni/NativeNfcManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp
index 99ffc77..62d62a9 100755
--- a/nci/jni/NativeNfcManager.cpp
+++ b/nci/jni/NativeNfcManager.cpp
@@ -565,7 +565,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;