diff options
| author | 2021-01-20 01:40:57 +0000 | |
|---|---|---|
| committer | 2021-01-20 01:40:57 +0000 | |
| commit | c76df1366c094cde3db166e9ce0f86835db763dd (patch) | |
| tree | b31aecc01e6aa8a57cbb99daf03b0b351f11ffed | |
| parent | 9923250234d691bcafe4bb0ec3f5960b87281642 (diff) | |
| parent | 994b5753c195345f334fd2addde7722896446408 (diff) | |
Merge "Add REQUIRE_UNLOCK_FOR_NFC broadcast to notify SystemUI"
| -rw-r--r-- | core/java/android/nfc/NfcAdapter.java | 8 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index a17a5370e787..f05706b0e710 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -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; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 714a09d02264..d737bcc9b5d6 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -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" /> |