Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1da08f1 authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android (Google) Code Review
Browse files

Merge "Expose Context.NSD_SERVICE"

parents e29ccb0d 60309fc7

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5319,6 +5319,7 @@ package android.content { 
    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

+2 −3
Original line number Diff line number Diff line
@@ -1770,12 +1770,11 @@ public abstract class Context { 


    /**

     * 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";