diff options
| author | Martijn Coenen <maco@google.com> | 2014-08-15 18:42:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-15 05:03:48 +0000 |
| commit | 6ab1a7d3d865303ef0dbfc5a43109510aa4335d6 (patch) | |
| tree | 1eb334dc8ba48832b70497251c731f52f3d97276 /nci | |
| parent | 5bf1a782b4aeaff4332324ed042fb2ca86a9bf8c (diff) | |
| parent | b83971cee905b31595595069666dc9469cebd683 (diff) | |
| download | android_packages_apps_Nfc-6ab1a7d3d865303ef0dbfc5a43109510aa4335d6.tar.gz android_packages_apps_Nfc-6ab1a7d3d865303ef0dbfc5a43109510aa4335d6.tar.bz2 android_packages_apps_Nfc-6ab1a7d3d865303ef0dbfc5a43109510aa4335d6.zip | |
Merge "Prevent deadlock during NDEF-detection." into lmp-dev
Diffstat (limited to 'nci')
| -rwxr-xr-x | nci/jni/NativeNfcTag.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/nci/jni/NativeNfcTag.cpp b/nci/jni/NativeNfcTag.cpp index 44472d01..840c64d8 100755 --- a/nci/jni/NativeNfcTag.cpp +++ b/nci/jni/NativeNfcTag.cpp @@ -999,12 +999,6 @@ void nativeNfcTag_doCheckNdefResult (tNFA_STATUS status, uint32_t maxSize, uint3 //#define RW_NDEF_FL_UNKNOWN 0x08 /* Unable to find if tag is ndef capable/formated/read only */ //#define RW_NDEF_FL_FORMATABLE 0x10 /* Tag supports format operation */ - if (status == NFC_STATUS_BUSY) - { - ALOGE ("%s: stack is busy", __FUNCTION__); - return; - } - if (!sCheckNdefWaitingForComplete) { ALOGE ("%s: not waiting", __FUNCTION__); |