diff options
| author | Martijn Coenen <maco@google.com> | 2016-06-30 09:14:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-30 09:14:14 +0000 |
| commit | 6e173c8c70fde2a42bbfaf5e1e92f44ee71cc422 (patch) | |
| tree | c4e3392e92dc27ddca9bb877b25b4c1faed6a8bf | |
| parent | 1c517e0f7d2162ec6bfbda964adf45ca69faa694 (diff) | |
| parent | 0edf35643cf31d3655edb23cd8ab04020b9ebba1 (diff) | |
| download | android_packages_apps_Nfc-6e173c8c70fde2a42bbfaf5e1e92f44ee71cc422.tar.gz android_packages_apps_Nfc-6e173c8c70fde2a42bbfaf5e1e92f44ee71cc422.tar.bz2 android_packages_apps_Nfc-6e173c8c70fde2a42bbfaf5e1e92f44ee71cc422.zip | |
Merge "Fix HCE can't handle last empty I-block of a chain" into nyc-mr1-dev
| -rwxr-xr-x | nci/jni/RoutingManager.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nci/jni/RoutingManager.cpp b/nci/jni/RoutingManager.cpp index 6a8a452b..17ccf559 100755 --- a/nci/jni/RoutingManager.cpp +++ b/nci/jni/RoutingManager.cpp @@ -454,20 +454,20 @@ void RoutingManager::notifyDeactivated (UINT8 technology) void RoutingManager::handleData (UINT8 technology, const UINT8* data, UINT32 dataLen, tNFA_STATUS status) { - if (dataLen <= 0) - { - ALOGE("no data"); - goto TheEnd; - } - if (status == NFA_STATUS_CONTINUE) { - mRxDataBuffer.insert (mRxDataBuffer.end(), &data[0], &data[dataLen]); //append data; more to come + if (dataLen > 0) + { + mRxDataBuffer.insert (mRxDataBuffer.end(), &data[0], &data[dataLen]); //append data; more to come + } return; //expect another NFA_CE_DATA_EVT to come } else if (status == NFA_STATUS_OK) { - mRxDataBuffer.insert (mRxDataBuffer.end(), &data[0], &data[dataLen]); //append data + if (dataLen > 0) + { + mRxDataBuffer.insert (mRxDataBuffer.end(), &data[0], &data[dataLen]); //append data + } //entire data packet has been received; no more NFA_CE_DATA_EVT } else if (status == NFA_STATUS_FAILED) |