Merge "Fix build"

Author: isheriff

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;
 

services/java/com/android/server/NsdService.java

@@ -399,7 +399,7 @@ public void setEnabled(boolean enable) {
     }
 
     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);