commit 422e128cd5b25b18c296099c67c67eb463ad9915
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Nov 10 18:31:33 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Nov 10 18:31:33 2023 +0000
tree 7206e58b2fe9436c2b761b8eb36096f91230d398
parent 42a2f9ee12fcc2aa5ac71948285c8ac6fcd1201e
parent 967466fe5eb00d182e1daa7da38057dac10a0b66

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25238220'] into security-aosp-tm-release.

Change-Id: I553fa7cb1e803a1edbd066f15e159dd5b8752136

src/com/android/nfc/NfcService.java

diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 54b0561..ad3c732 100644
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -1154,9 +1154,7 @@
     }
 
     public boolean isSecureNfcEnabled() {
-        synchronized (NfcService.this) {
-            return mIsSecureNfcEnabled;
-        }
+        return mIsSecureNfcEnabled;
     }
 
     final class NfcAdapterService extends INfcAdapter.Stub {