mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
964877bbf6
wgetb96ee4a2d1.patch -O telephony-01.patch wgetc16e6e78c1.patch -O media-01.patch wgetd5771450d7.patch -O media-02.patch wgeta1370bd00c.patch -O nn-01.patch wgetce2776f4ca.patch -O bt-01.patch wget585f583ef5.patch -O bt-02.patch wgetc9905e7968.patch -O bt-03.patch wgetc93ec045f5.patch -O bt-04.patch wget89fb17d172.patch -O bt-05.patch wget14aed2455e.patch -O bt-06.patch wgetcd438ebc52.patch -O bt-07.patch wget27e7cdc4e5.patch -O nfc-01.patch wgetdfeb4270b8.patch -O launcher-01.patch wgetb1993f6cec.patch -O native-01.patch wgetdf4a9362cd.patch -O fwb-01.patch wgetb55563bb9d.patch -O fwb-02.patch wgeta80971a281.patch -O fwb-03.patch wget7e173b4383.patch -O fwb-04.patch wget44191b1c6b.patch -O fwb-05.patch wget8dc8dfe572.patch -O fwb-06.patch wget00a4224100.patch -O av-01.patch wget21623d1f43.patch -O settings-01.patch wgetfa5ec443d9.patch -O settings-02.patch wgetba4da9c7b3.patch -O settings-03.patch Signed-off-by: Tad <tad@spotco.us>
48 lines
2.3 KiB
Diff
48 lines
2.3 KiB
Diff
From 27e7cdc4e5748e2ad85552433cf9c120fd7a936b Mon Sep 17 00:00:00 2001
|
|
From: Alisher Alikhodjaev <alisher@google.com>
|
|
Date: Wed, 10 May 2023 18:27:42 -0700
|
|
Subject: [PATCH] Ensure that SecureNFC setting cannot be bypassed
|
|
|
|
Bug: 268038643
|
|
Test: ctsverifier
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6cb53d963d376b97963120a4d2c7df961789e428)
|
|
Merged-In: I53a45c3600dc6bba7009921ca5135ee37b5edfd0
|
|
Change-Id: I53a45c3600dc6bba7009921ca5135ee37b5edfd0
|
|
---
|
|
src/com/android/nfc/NfcService.java | 6 ++++++
|
|
src/com/android/nfc/cardemulation/HostEmulationManager.java | 4 +++-
|
|
2 files changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
|
|
index a1b28e97..2305922a 100644
|
|
--- a/src/com/android/nfc/NfcService.java
|
|
+++ b/src/com/android/nfc/NfcService.java
|
|
@@ -1166,6 +1166,12 @@ void enforceBeamShareActivityPolicy(Context context, UserHandle uh) {
|
|
}
|
|
}
|
|
|
|
+ public boolean isSecureNfcEnabled() {
|
|
+ synchronized (NfcService.this) {
|
|
+ return mIsSecureNfcEnabled;
|
|
+ }
|
|
+ }
|
|
+
|
|
final class NfcAdapterService extends INfcAdapter.Stub {
|
|
@Override
|
|
public boolean enable() throws RemoteException {
|
|
diff --git a/src/com/android/nfc/cardemulation/HostEmulationManager.java b/src/com/android/nfc/cardemulation/HostEmulationManager.java
|
|
index 81462024..8849cca5 100644
|
|
--- a/src/com/android/nfc/cardemulation/HostEmulationManager.java
|
|
+++ b/src/com/android/nfc/cardemulation/HostEmulationManager.java
|
|
@@ -188,7 +188,9 @@ public void onHostEmulationData(byte[] data) {
|
|
// Resolve to default
|
|
// Check if resolvedService requires unlock
|
|
ApduServiceInfo defaultServiceInfo = resolveInfo.defaultService;
|
|
- if (defaultServiceInfo.requiresUnlock() && mKeyguard.isKeyguardLocked()) {
|
|
+ if ((defaultServiceInfo.requiresUnlock()
|
|
+ || NfcService.getInstance().isSecureNfcEnabled())
|
|
+ && mKeyguard.isKeyguardLocked()) {
|
|
NfcService.getInstance().sendRequireUnlockIntent();
|
|
NfcService.getInstance().sendData(AID_NOT_FOUND);
|
|
if (DBG) Log.d(TAG, "requiresUnlock()! show toast");
|