mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-07-05 11:01:17 +00:00
59bf3b75c7
https://review.lineageos.org/c/LineageOS/android_frameworks_base/+/353117 https://review.lineageos.org/q/topic:Q_asb_2023-03 https://review.lineageos.org/q/topic:Q_asb_2023-04 https://review.lineageos.org/q/topic:Q_asb_2023-05 https://review.lineageos.org/q/topic:Q_asb_2023-06 https://review.lineageos.org/q/topic:Q_asb_2023-07 https://review.lineageos.org/q/topic:Q_asb_2023-08 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/376560 https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/376561 https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/376562 https://review.lineageos.org/q/topic:Q_asb_2023-09 https://review.lineageos.org/q/topic:Q_asb_2023-10 https://review.lineageos.org/q/topic:Q_asb_2023-11 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/376563 accounted for via manifest change: https://review.lineageos.org/c/LineageOS/android_external_webp/+/376568 https://review.lineageos.org/q/topic:Q_asb_2023-12 https://review.lineageos.org/q/topic:Q_asb_2024-01 https://review.lineageos.org/q/topic:Q_asb_2024-02 https://review.lineageos.org/q/topic:Q_asb_2024-03 Signed-off-by: Tavi <tavi@divested.dev>
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alisher Alikhodjaev <alisher@google.com>
|
|
Date: Tue, 31 Oct 2023 11:13:03 -0700
|
|
Subject: [PATCH] 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
|
|
---
|
|
src/com/android/nfc/NfcService.java | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
|
|
index d41ea4f2..c69c9466 100644
|
|
--- a/src/com/android/nfc/NfcService.java
|
|
+++ b/src/com/android/nfc/NfcService.java
|
|
@@ -1135,9 +1135,7 @@ public class NfcService implements DeviceHostListener {
|
|
}
|
|
|
|
public boolean isSecureNfcEnabled() {
|
|
- synchronized (NfcService.this) {
|
|
- return mIsSecureNfcEnabled;
|
|
- }
|
|
+ return mIsSecureNfcEnabled;
|
|
}
|
|
|
|
final class NfcAdapterService extends INfcAdapter.Stub {
|