Add initial framework for DNS service discovery

Change-Id: I53c0b7ebfd75e520ebb7553612f1aa8413b6b79b

Author: isheriff

Android.mk

@@ -117,6 +117,7 @@ LOCAL_SRC_FILES += \
 	core/java/android/net/INetworkPolicyListener.aidl \
 	core/java/android/net/INetworkPolicyManager.aidl \
 	core/java/android/net/INetworkStatsService.aidl \
+	core/java/android/net/nsd/INsdManager.aidl \
 	core/java/android/nfc/INdefPushCallback.aidl \
 	core/java/android/nfc/INfcAdapter.aidl \
 	core/java/android/nfc/INfcAdapterExtras.aidl \

core/java/android/app/ContextImpl.java

@@ -59,6 +59,8 @@
 import android.net.ThrottleManager;
 import android.net.IThrottleManager;
 import android.net.Uri;
+import android.net.nsd.INsdManager;
+import android.net.nsd.NsdManager;
 import android.net.wifi.IWifiManager;
 import android.net.wifi.WifiManager;
 import android.net.wifi.p2p.IWifiP2pManager;
@@ -372,6 +374,14 @@ public Object createService(ContextImpl ctx) {
                         ctx.mMainThread.getHandler());
                 }});
 
+        registerService(NSD_SERVICE, new ServiceFetcher() {
+                @Override
+                public Object createService(ContextImpl ctx) {
+                    IBinder b = ServiceManager.getService(NSD_SERVICE);
+                    INsdManager service = INsdManager.Stub.asInterface(b);
+                    return new NsdManager(service);
+                }});
+
         // Note: this was previously cached in a static variable, but
         // constructed using mMainThread.getHandler(), so converting
         // it to be a regular Context-cached service...

core/java/android/content/Context.java

@@ -1768,6 +1768,18 @@ public abstract boolean startInstrumentation(ComponentName className,
      */
     public static final String WIFI_P2P_SERVICE = "wifip2p";
 
+    /**
+     * Use with {@link #getSystemService} to retrieve a {@link
+     * android.net.NsdManager} for handling management of network service
+     * discovery
+     *
+     * @hide
+     * @see #getSystemService
+     * @see android.net.NsdManager
+     */
+    public static final String NSD_SERVICE = "servicediscovery";
+
+
     /**
      * Use with {@link #getSystemService} to retrieve a
      * {@link android.media.AudioManager} for handling management of volume,