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

Merge "Make NfcAdapter STATE_CHANGED intent action public."

Browse Source
This commit is contained in:
Martijn Coenen
2013-01-09 11:45:02 -08:00
committed by Android (Google) Code Review
parent b102fb8ed5 4ba5eaf7f3
commit 8a9120f04e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -13785,9 +13785,11 @@ package android.nfc {
method public void setNdefPushMessage(android.nfc.NdefMessage, android.app.Activity, android.app.Activity...); 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 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...); 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_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_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 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_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_NDEF_MESSAGES = "android.nfc.extra.NDEF_MESSAGES";
field public static final java.lang.String EXTRA_TAG = "android.nfc.extra.TAG"; field public static final java.lang.String EXTRA_TAG = "android.nfc.extra.TAG";

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

@@ -174,21 +174,19 @@ public final class NfcAdapter {
* Broadcast Action: The state of the local NFC adapter has been * Broadcast Action: The state of the local NFC adapter has been
* changed. * changed.
* <p>For example, NFC has been turned on or off. * <p>For example, NFC has been turned on or off.
* <p>Always contains the extra field {@link #EXTRA_STATE} * <p>Always contains the extra field {@link #EXTRA_ADAPTER_STATE}
* @hide
*/ */
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_ADAPTER_STATE_CHANGED = public static final String ACTION_ADAPTER_STATE_CHANGED =
"android.nfc.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: * intents to request the current power state. Possible values are:
* {@link #STATE_OFF}, * {@link #STATE_OFF},
* {@link #STATE_TURNING_ON}, * {@link #STATE_TURNING_ON},
* {@link #STATE_ON}, * {@link #STATE_ON},
* {@link #STATE_TURNING_OFF}, * {@link #STATE_TURNING_OFF},
* @hide
*/ */
public static final String EXTRA_ADAPTER_STATE = "android.nfc.extra.ADAPTER_STATE"; public static final String EXTRA_ADAPTER_STATE = "android.nfc.extra.ADAPTER_STATE";