drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add network service discovery broadcast"

Browse Source
This commit is contained in:
Irfan Sheriff
2012-04-19 09:57:24 -07:00
committed by Android (Google) Code Review
parent 66e69db6d9 6c07ba8183
commit 75e91f7716
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@ -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
}

6
core/java/android/net/nsd/NsdManager.java
View File

@ -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;