diff options
| author | 2013-01-09 12:28:38 -0800 | |
|---|---|---|
| committer | 2013-01-09 12:28:44 -0800 | |
| commit | 2e9f65f978397d112dbfb134d374588515bb644a (patch) | |
| tree | 295eb06b1215738f9ce49a652274176c3e27e281 | |
| parent | ceea88578ce53bdee96c561cd5fa5dae725f9a7b (diff) | |
| parent | e55fe4f3bb19992d8dcfc5cb19528f9a52cdcbb1 (diff) | |
Merge "Make NfcAdapter states public and fix build."
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/nfc/NfcAdapter.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index dad9954b31d1..72e7601e0259 100644 --- a/api/current.txt +++ b/api/current.txt @@ -13793,6 +13793,10 @@ package android.nfc { 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"; + field public static final int STATE_OFF = 1; // 0x1 + field public static final int STATE_ON = 3; // 0x3 + field public static final int STATE_TURNING_OFF = 4; // 0x4 + field public static final int STATE_TURNING_ON = 2; // 0x2 } public static abstract interface NfcAdapter.CreateBeamUrisCallback { diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index 1963beb74f8b..6ad382b9a53c 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -190,13 +190,9 @@ public final class NfcAdapter { */ public static final String EXTRA_ADAPTER_STATE = "android.nfc.extra.ADAPTER_STATE"; - /** @hide */ public static final int STATE_OFF = 1; - /** @hide */ public static final int STATE_TURNING_ON = 2; - /** @hide */ public static final int STATE_ON = 3; - /** @hide */ public static final int STATE_TURNING_OFF = 4; /** @hide */ |