From 4ba5eaf7f3b92656311f1ea1869d359729ba88e4 Mon Sep 17 00:00:00 2001 From: Martijn Coenen Date: Tue, 8 Jan 2013 12:49:47 -0800 Subject: [PATCH] Make NfcAdapter STATE_CHANGED intent action public. Bug: 5141885 Change-Id: Ia357409a51fb45f1739bb37940fa746f94fa9056 --- api/current.txt | 2 ++ core/java/android/nfc/NfcAdapter.java | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/current.txt b/api/current.txt index 111bd655e672e..85d20f6456eda 100644 --- a/api/current.txt +++ b/api/current.txt @@ -13785,9 +13785,11 @@ package android.nfc { method public void setNdefPushMessage(android.nfc.NdefMessage, android.app.Activity, android.app.Activity...); method public void setNdefPushMessageCallback(android.nfc.NfcAdapter.CreateNdefMessageCallback, android.app.Activity, android.app.Activity...); method public void setOnNdefPushCompleteCallback(android.nfc.NfcAdapter.OnNdefPushCompleteCallback, android.app.Activity, android.app.Activity...); + field public static final java.lang.String ACTION_ADAPTER_STATE_CHANGED = "android.nfc.action.ADAPTER_STATE_CHANGED"; field public static final java.lang.String ACTION_NDEF_DISCOVERED = "android.nfc.action.NDEF_DISCOVERED"; field public static final java.lang.String ACTION_TAG_DISCOVERED = "android.nfc.action.TAG_DISCOVERED"; field public static final java.lang.String ACTION_TECH_DISCOVERED = "android.nfc.action.TECH_DISCOVERED"; + field public static final java.lang.String EXTRA_ADAPTER_STATE = "android.nfc.extra.ADAPTER_STATE"; field public static final java.lang.String EXTRA_ID = "android.nfc.extra.ID"; field public static final java.lang.String EXTRA_NDEF_MESSAGES = "android.nfc.extra.NDEF_MESSAGES"; field public static final java.lang.String EXTRA_TAG = "android.nfc.extra.TAG"; diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index 4baceed1d5813..1963beb74f8be 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -174,21 +174,19 @@ public final class NfcAdapter { * Broadcast Action: The state of the local NFC adapter has been * changed. *

For example, NFC has been turned on or off. - *

Always contains the extra field {@link #EXTRA_STATE} - * @hide + *

Always contains the extra field {@link #EXTRA_ADAPTER_STATE} */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_ADAPTER_STATE_CHANGED = "android.nfc.action.ADAPTER_STATE_CHANGED"; /** - * Used as an int extra field in {@link #ACTION_STATE_CHANGED} + * Used as an int extra field in {@link #ACTION_ADAPTER_STATE_CHANGED} * intents to request the current power state. Possible values are: * {@link #STATE_OFF}, * {@link #STATE_TURNING_ON}, * {@link #STATE_ON}, * {@link #STATE_TURNING_OFF}, - * @hide */ public static final String EXTRA_ADAPTER_STATE = "android.nfc.extra.ADAPTER_STATE";