commit e1fc6447761d0c668867051821fc9b29dcfb88f5
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Dec 14 00:21:05 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Dec 14 00:21:05 2023 +0000
tree 8e3d0701ebb146e0e319e0408dc6c131882fa0c8
parent d36008babc876cdf0c2c92c7f7a71a2df194d688
parent ead2334bf74b8bfb3c68337e7d9e3c5478e45c44

Snap for 11216811 from ead2334bf74b8bfb3c68337e7d9e3c5478e45c44 to 24Q1-release

Change-Id: I20ce43bab719441c50c80d284a3a2107b5401c97

nci/jni/NativeNfcManager.cpp

diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp
index 3d8beec..603d8ab 100644
--- a/nci/jni/NativeNfcManager.cpp
+++ b/nci/jni/NativeNfcManager.cpp
@@ -928,6 +928,9 @@
                                     jint route, jint aidInfo, jint power) {
   uint8_t* buf;
   size_t bufLen;
+  if (sIsDisabling || !sIsNfaEnabled) {
+    return false;
+  }
 
   if (aid == NULL) {
     buf = NULL;
@@ -956,6 +959,9 @@
 static jboolean nfcManager_unrouteAid(JNIEnv* e, jobject, jbyteArray aid) {
   uint8_t* buf;
   size_t bufLen;
+  if (sIsDisabling || !sIsNfaEnabled) {
+    return false;
+  }
 
   if (aid == NULL) {
     buf = NULL;