Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8feaa187 authored by George Chang's avatar George Chang Committed by Automerger Merge Worker
Browse files

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I907024f196e452971f7ba4948aa9a68668a50ede
parents a5a27812 c76df136

core/java/android/nfc/NfcAdapter.java

+8 −0
Original line number Diff line number Diff line
@@ -358,6 +358,14 @@ public final class NfcAdapter { 
    public static final String 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

    static boolean sIsInitialized = false;

    static boolean sHasNfcFeature;

core/res/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -312,6 +312,7 @@ 
    <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.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_DOWN" />

    <protected-broadcast android:name="com.android.nfc.cardemulation.action.CLOSE_TAP_DIALOG" />