commit 5069285ba32f7fc599fca9ca8ec97750a7c6ac3a
author Love Khanna <love.khanna@nxp.com> Tue Mar 20 16:19:35 2018 -0700
committer Ruchi Kandoi <kandoiruchi@google.com> Wed Mar 21 18:44:26 2018 +0000
tree ba28c312b1d85878cd0c62a69b6be235f6b6bef3
parent 4ad75a54fb05aa7459a06580ec0118a841780fe2

Fix Mifare Classic Transaction Fail issue

Send error response to application if transaction failed.

Bug: 73799586
Bug: 75270911
Test: test Mifare Classic card with TagInfo
Change-Id: Ie408b8c0af88d7c8c1f6f8ec729bda0b3a837e09

nci/jni/NativeNfcTag.cpp

diff --git a/nci/jni/NativeNfcTag.cpp b/nci/jni/NativeNfcTag.cpp
index ebc0fcc..4b815aa 100644
--- a/nci/jni/NativeNfcTag.cpp
+++ b/nci/jni/NativeNfcTag.cpp
@@ -973,10 +973,9 @@
         if (EXTNS_CheckMfcResponse(&transData, &transDataLen) ==
             NFCSTATUS_FAILED) {
           nativeNfcTag_doReconnect(e, o);
-        } else {
-          if (transDataLen != 0) {
-            result.reset(e->NewByteArray(transDataLen));
-          }
+        }
+        if (transDataLen != 0) {
+          result.reset(e->NewByteArray(transDataLen));
           if (result.get() != NULL) {
             e->SetByteArrayRegion(result.get(), 0, transDataLen,
                                   (const jbyte*)transData);