am a29bf14e: Merge "New Intent defined for RF ON/OFF events" into gingerbread

* commit 'a29bf14e1d2857debc632ce4304a1c72dded348c':
  New Intent defined for RF ON/OFF events
This commit is contained in:
Nick Pelly
2011-01-12 16:33:48 -08:00
committed by Android Git Automerger

View File

@@ -99,6 +99,20 @@ public final class NfcAdapter {
public static final String ACTION_TRANSACTION_DETECTED =
"android.nfc.action.TRANSACTION_DETECTED";
/**
* Broadcast Action: an RF field ON has been detected.
* @hide
*/
public static final String ACTION_RF_FIELD_ON_DETECTED =
"android.nfc.action.RF_FIELD_ON_DETECTED";
/**
* Broadcast Action: an RF Field OFF has been detected.
* @hide
*/
public static final String ACTION_RF_FIELD_OFF_DETECTED =
"android.nfc.action.RF_FIELD_OFF_DETECTED";
/**
* Broadcast Action: an adapter's state changed between enabled and disabled.
*