commit bc5a249007e4d2a671c9cf00377a984e7c5aa5d1
author Alexandra Ducati-Manas <alexandra.ducati-manas@st.com> Thu Apr 18 16:37:49 2024 +0200
committer Alexandra Ducati-Manas <alexandra.ducati-manas@st.com> Wed Apr 24 11:56:51 2024 +0000
tree aa9cab3071d1326dbb4303ddd0555a3cc1d9b0ca
parent 2c2e53709d691d460757e563d22a13e904741b11

Code cleanup: removed disconnection of P2P target mode when tag disconnected

Bug: 335639730
Change-Id: I79470c3f463db5a926d275705ecc3be2e3dfa7e3

nci/jni/NativeNfcManager.cpp

diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp
index 352f8cd..118b978 100644
--- a/nci/jni/NativeNfcManager.cpp
+++ b/nci/jni/NativeNfcManager.cpp
@@ -1324,11 +1324,8 @@
     stopPolling_rfDiscoveryDisabled();
     startPolling_rfDiscoveryDisabled(tech_mask);
 
-    // Start P2P listening if tag polling was enabled
     if (sPollingEnabled) {
-            LOG(DEBUG) << StringPrintf("%s: Enable p2pListening", __func__);
-
-            if (reader_mode && !sReaderModeEnabled) {
+      if (reader_mode && !sReaderModeEnabled) {
         sReaderModeEnabled = true;
         NFA_DisableListening();
 

src/com/android/nfc/NfcService.java

diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 0a913f3..be3c3ec 100644
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -2936,16 +2936,6 @@
                 // Disconnect from tags
                 TagEndpoint tag = (TagEndpoint) o;
                 tag.disconnect();
-            } else if (o instanceof NfcDepEndpoint) {
-                // Disconnect from P2P devices
-                NfcDepEndpoint device = (NfcDepEndpoint) o;
-                if (device.getMode() == NfcDepEndpoint.MODE_P2P_TARGET) {
-                    // Remote peer is target, request disconnection
-                    device.disconnect();
-                } else {
-                    // Remote peer is initiator, we cannot disconnect
-                    // Just wait for field removal
-                }
             }
         }
     }