commit c1da08f1aea42d958c0dd245f1d58345e43eb323
author Irfan Sheriff <isheriff@google.com> Tue Apr 24 15:13:03 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 24 15:13:03 2012 -0700
tree a595b6ae63bf197f5bc5bdc99c1868b31d9970e9
parent e29ccb0d678c712c71bf73f1c66626feff4fa346
parent 60309fc7bb95c9b3fc3e0ed60aa1eeb35bd13a68

Merge "Expose Context.NSD_SERVICE"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 621d0a3..08ffd49 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -5319,6 +5319,7 @@
     field public static final int MODE_WORLD_WRITEABLE = 2; // 0x2
     field public static final java.lang.String NFC_SERVICE = "nfc";
     field public static final java.lang.String NOTIFICATION_SERVICE = "notification";
+    field public static final java.lang.String NSD_SERVICE = "servicediscovery";
     field public static final java.lang.String POWER_SERVICE = "power";
     field public static final java.lang.String SEARCH_SERVICE = "search";
     field public static final java.lang.String SENSOR_SERVICE = "sensor";

core/java/android/content/Context.java

diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 381daa3..4c169d38 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -1770,12 +1770,11 @@
 
     /**
      * Use with {@link #getSystemService} to retrieve a {@link
-     * android.net.NsdManager} for handling management of network service
+     * android.net.nsd.NsdManager} for handling management of network service
      * discovery
      *
-     * @hide
      * @see #getSystemService
-     * @see android.net.NsdManager
+     * @see android.net.nsd.NsdManager
      */
     public static final String NSD_SERVICE = "servicediscovery";