Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add REQUIRE_UNLOCK_FOR_NFC broadcast to notify SystemUI" am: c76df1366c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552500

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I907024f196e452971f7ba4948aa9a68668a50ede
This commit is contained in:
George Chang
2021-01-20 02:04:00 +00:00
committed by Automerger Merge Worker
parent a5a278129c c76df1366c
commit 8feaa187be
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/nfc/NfcAdapter.java
View File

@@ -358,6 +358,14 @@ public final class NfcAdapter {
public static final String EXTRA_HANDOVER_TRANSFER_URI = public static final String EXTRA_HANDOVER_TRANSFER_URI =
"android.nfc.extra.HANDOVER_TRANSFER_URI"; "android.nfc.extra.HANDOVER_TRANSFER_URI";
/**
* Broadcast Action: Notify possible NFC transaction blocked because device is locked.
* <p>An external NFC field detected when device locked and SecureNfc enabled.
* @hide
*/
public static final String ACTION_REQUIRE_UNLOCK_FOR_NFC =
"android.nfc.action.REQUIRE_UNLOCK_FOR_NFC";
// Guarded by NfcAdapter.class // Guarded by NfcAdapter.class
static boolean sIsInitialized = false; static boolean sIsInitialized = false;
static boolean sHasNfcFeature; static boolean sHasNfcFeature;

1
core/res/AndroidManifest.xml
View File

@@ -312,6 +312,7 @@
<protected-broadcast android:name="android.nfc.action.ADAPTER_STATE_CHANGED" /> <protected-broadcast android:name="android.nfc.action.ADAPTER_STATE_CHANGED" />
<protected-broadcast android:name="android.nfc.action.PREFERRED_PAYMENT_CHANGED" /> <protected-broadcast android:name="android.nfc.action.PREFERRED_PAYMENT_CHANGED" />
<protected-broadcast android:name="android.nfc.action.TRANSACTION_DETECTED" /> <protected-broadcast android:name="android.nfc.action.TRANSACTION_DETECTED" />
<protected-broadcast android:name="android.nfc.action.REQUIRE_UNLOCK_FOR_NFC" />
<protected-broadcast android:name="com.android.nfc.action.LLCP_UP" /> <protected-broadcast android:name="com.android.nfc.action.LLCP_UP" />
<protected-broadcast android:name="com.android.nfc.action.LLCP_DOWN" /> <protected-broadcast android:name="com.android.nfc.action.LLCP_DOWN" />
<protected-broadcast android:name="com.android.nfc.cardemulation.action.CLOSE_TAP_DIALOG" /> <protected-broadcast android:name="com.android.nfc.cardemulation.action.CLOSE_TAP_DIALOG" />