summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Irfan Sheriff <isheriff@google.com> 2012-04-19 10:27:58 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2012-04-19 10:27:58 -0700
commitf40a02f85f112e4b78fcea6f0d0390bfad15c2e2 (patch)
treecd28be557574a718cfbe089894313a354d670004
parent6db653355bbf79f4bfe666fb96262c0df2ec34aa (diff)
parent54ac7a510245e5f00c16ff5595b6ae8d002c1c3b (diff)
Merge "Fix build"
-rw-r--r--core/java/android/net/nsd/NsdManager.java4
-rw-r--r--services/java/com/android/server/NsdService.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/net/nsd/NsdManager.java b/core/java/android/net/nsd/NsdManager.java
index ecf5e209913a..77e97e1063c3 100644
--- a/core/java/android/net/nsd/NsdManager.java
+++ b/core/java/android/net/nsd/NsdManager.java
@@ -158,14 +158,14 @@ public class NsdManager {
/**
* Network service discovery is disabled
*
- * @see #NSD_STATE_CHANGED_ACTION
+ * @see #ACTION_NSD_STATE_CHANGED
*/
public static final int NSD_STATE_DISABLED = 1;
/**
* Network service discovery is enabled
*
- * @see #NSD_STATE_CHANGED_ACTION
+ * @see #ACTION_NSD_STATE_CHANGED
*/
public static final int NSD_STATE_ENABLED = 2;
diff --git a/services/java/com/android/server/NsdService.java b/services/java/com/android/server/NsdService.java
index 839fbe279d38..f33bf8b24e63 100644
--- a/services/java/com/android/server/NsdService.java
+++ b/services/java/com/android/server/NsdService.java
@@ -399,7 +399,7 @@ public class NsdService extends INsdManager.Stub {
}
private void sendNsdStateChangeBroadcast(boolean enabled) {
- final Intent intent = new Intent(NsdManager.NSD_STATE_CHANGED_ACTION);
+ final Intent intent = new Intent(NsdManager.ACTION_NSD_STATE_CHANGED);
intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
if (enabled) {
intent.putExtra(NsdManager.EXTRA_NSD_STATE, NsdManager.NSD_STATE_ENABLED);