diff options
| author | 2012-04-19 09:57:24 -0700 | |
|---|---|---|
| committer | 2012-04-19 09:57:24 -0700 | |
| commit | 75e91f77160e6f48dae780cc58df42a2bc896c1e (patch) | |
| tree | cdf0c6e5835d1bcbc85907c7f2e0a35777eb9033 | |
| parent | 66e69db6d99dd1c1a3906ae1b941ea13703f73b5 (diff) | |
| parent | 6c07ba8183edc593527335238a2c6083392df7bc (diff) | |
Merge "Add network service discovery broadcast"
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/net/nsd/NsdManager.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index afcca22474b8..d95868ffcaba 100644 --- a/api/current.txt +++ b/api/current.txt @@ -12485,10 +12485,14 @@ package android.net.nsd { method public void resolveService(android.net.nsd.NsdManager.Channel, java.lang.String, java.lang.String, android.net.nsd.NsdManager.DnsSdResolveListener); method public void stopServiceDiscovery(android.net.nsd.NsdManager.Channel, android.net.nsd.NsdManager.ActionListener); method public void unregisterService(android.net.nsd.NsdManager.Channel, int, android.net.nsd.NsdManager.ActionListener); + field public static final java.lang.String ACTION_NSD_STATE_CHANGED = "android.net.nsd.STATE_CHANGED"; field public static final int ALREADY_ACTIVE = 3; // 0x3 field public static final int BUSY = 2; // 0x2 field public static final int ERROR = 0; // 0x0 + field public static final java.lang.String EXTRA_NSD_STATE = "nsd_state"; field public static final int MAX_REGS_REACHED = 4; // 0x4 + field public static final int NSD_STATE_DISABLED = 1; // 0x1 + field public static final int NSD_STATE_ENABLED = 2; // 0x2 field public static final int UNSUPPORTED = 1; // 0x1 } diff --git a/core/java/android/net/nsd/NsdManager.java b/core/java/android/net/nsd/NsdManager.java index 62c141d55834..ecf5e209913a 100644 --- a/core/java/android/net/nsd/NsdManager.java +++ b/core/java/android/net/nsd/NsdManager.java @@ -141,10 +141,9 @@ public class NsdManager { * information as int. * * @see #EXTRA_NSD_STATE - * @hide */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - public static final String NSD_STATE_CHANGED_ACTION = + public static final String ACTION_NSD_STATE_CHANGED = "android.net.nsd.STATE_CHANGED"; /** @@ -153,7 +152,6 @@ public class NsdManager { * * @see #NSD_STATE_DISABLED * @see #NSD_STATE_ENABLED - * @hide */ public static final String EXTRA_NSD_STATE = "nsd_state"; @@ -161,7 +159,6 @@ public class NsdManager { * Network service discovery is disabled * * @see #NSD_STATE_CHANGED_ACTION - * @hide */ public static final int NSD_STATE_DISABLED = 1; @@ -169,7 +166,6 @@ public class NsdManager { * Network service discovery is enabled * * @see #NSD_STATE_CHANGED_ACTION - * @hide */ public static final int NSD_STATE_ENABLED = 2; |