commit 2e4ce0c33777bcc99a446c6f06df9ade6959b8f7
author Prashantsinh Parmar <prashantsinh.parmar@fairphone.partners> Tue Oct 10 15:11:12 2023 +0530
committer Prashantsinh Parmar <prashantsinh.parmar@fairphone.partners> Wed Oct 11 13:09:53 2023 +0200
tree 0174d5613005aa777451efe398760f4f1f740ecd
parent 6bc48a18e547675a0cd1021b9aa3acc59eb7b733
parent 8fd74849aa4542f974cd602be53a6b768ea2b971

Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3

* dev/11/fp3/security-aosp-rvc-release:
  Ensure that SecureNFC setting cannot be bypassed

Change-Id: I7032e2865fa5560c12b50a84d373572d226eb084

src/com/android/nfc/NfcService.java

diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index e4ce886..5a74733 100644
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -916,6 +916,12 @@
         }
     }
 
+    public boolean isSecureNfcEnabled() {
+        synchronized (NfcService.this) {
+            return mIsSecureNfcEnabled;
+        }
+    }
+
     final class NfcAdapterService extends INfcAdapter.Stub {
         /**
          * An interface for vendor specific extensions

src/com/android/nfc/cardemulation/HostEmulationManager.java

diff --git a/src/com/android/nfc/cardemulation/HostEmulationManager.java b/src/com/android/nfc/cardemulation/HostEmulationManager.java
index 2d763f9..54b2bab 100644
--- a/src/com/android/nfc/cardemulation/HostEmulationManager.java
+++ b/src/com/android/nfc/cardemulation/HostEmulationManager.java
@@ -174,8 +174,9 @@
                     // Resolve to default
                     // Check if resolvedService requires unlock
                     ApduServiceInfo defaultServiceInfo = resolveInfo.defaultService;
-                    if (defaultServiceInfo.requiresUnlock() &&
-                            mKeyguard.isKeyguardLocked() && mKeyguard.isKeyguardSecure()) {
+                    if ((defaultServiceInfo.requiresUnlock()
+                            || NfcService.getInstance().isSecureNfcEnabled())
+                          && mKeyguard.isKeyguardLocked() && mKeyguard.isKeyguardSecure()) {
                         // Just ignore all future APDUs until next tap
                         mState = STATE_W4_DEACTIVATE;
                         launchTapAgain(resolveInfo.defaultService, resolveInfo.category);