summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlisher Alikhodjaev <alisher@google.com>2023-10-31 11:13:03 -0700
committerJulian Veit <Claymore1298@gmail.com>2024-01-09 07:41:40 +0100
commitab1f4fd8c6db320475a46f5646ea9473eb7433e4 (patch)
tree7a19fb0d9be727a56deb7a4c5b9ff849b5910121
parentad8ca959472df4bb5083ded4a0163373b68be5c3 (diff)
Possible deadlock on the NfcService object
Bug: 268038643 Bug: 307489565 Test: CtsVerifier (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2d8ea70c65831313d73784fb3c78f64ff0cbd627) Merged-In: I683ae425dafa4e209b9517b62ada7d8a694f84a9 Change-Id: I683ae425dafa4e209b9517b62ada7d8a694f84a9
-rw-r--r--src/com/android/nfc/NfcService.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 37514220..00ec44cb 100644
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -1170,9 +1170,7 @@ public class NfcService implements DeviceHostListener {
}
public boolean isSecureNfcEnabled() {
- synchronized (NfcService.this) {
- return mIsSecureNfcEnabled;
- }
+ return mIsSecureNfcEnabled;
}
final class NfcAdapterService extends INfcAdapter.Stub {