commit 92f9d3f1e7aaaad0596a20aa5d35e37e66fdba28
author Arach MOHAMMED BRAHIM <arach.mohammed.brahim@st.com> Fri Apr 16 13:48:39 2021 +0200
committer George Chang <georgekgchang@google.com> Tue Apr 27 16:33:11 2021 +0000
tree a1c04ae4b30ff5361de8ffb47f21fca38df635b2
parent dd5f118ee68be4f4f814f790c6534cdbfb76a7df

Do not allow Mifare protocol tag to switch to Frame RF interface

Bug: 175353436
Bug: 182991326
Change-Id: I56327e16cbc503725d13011321dd717618324b74

nci/jni/NativeNfcTag.cpp

diff --git a/nci/jni/NativeNfcTag.cpp b/nci/jni/NativeNfcTag.cpp
index 677a8a9..cc167e6 100644
--- a/nci/jni/NativeNfcTag.cpp
+++ b/nci/jni/NativeNfcTag.cpp
@@ -581,11 +581,14 @@
 
   if (sCurrentConnectedTargetType == TARGET_TYPE_ISO14443_3A ||
       sCurrentConnectedTargetType == TARGET_TYPE_ISO14443_3B) {
-    DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+
+      if (sCurrentConnectedTargetProtocol != NFC_PROTOCOL_MIFARE) {
+        DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
         "%s: switching to tech: %d need to switch rf intf to frame", __func__,
         sCurrentConnectedTargetType);
-    retCode = switchRfInterface(NFA_INTERFACE_FRAME) ? NFA_STATUS_OK
-                                                     : NFA_STATUS_FAILED;
+        retCode = switchRfInterface(NFA_INTERFACE_FRAME) ? NFA_STATUS_OK
+                                                         : NFA_STATUS_FAILED;
+      }
   } else if (sCurrentConnectedTargetType == TARGET_TYPE_MIFARE_CLASSIC) {
     retCode = switchRfInterface(NFA_INTERFACE_MIFARE) ? NFA_STATUS_OK
                                                       : NFA_STATUS_FAILED;