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

Commit e0784e05 authored by Xinyi Zhou's avatar Xinyi Zhou Committed by Android (Google) Code Review
Browse files

Merge "Expose Conext.NEARBY_SERVICE as SystemApi"

parents d21bfc7b 1a07c532

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2592,6 +2592,7 @@ package android.content { 
    field public static final String HDMI_CONTROL_SERVICE = "hdmi_control";

    field public static final String MEDIA_TRANSCODING_SERVICE = "media_transcoding";

    field public static final String MUSIC_RECOGNITION_SERVICE = "music_recognition";

    field public static final String NEARBY_SERVICE = "nearby";

    field public static final String NETD_SERVICE = "netd";

    field @Deprecated public static final String NETWORK_SCORE_SERVICE = "network_score";

    field public static final String OEM_LOCK_SERVICE = "oem_lock";

core/java/android/content/Context.java

+1 −0
Original line number Diff line number Diff line
@@ -5922,6 +5922,7 @@ public abstract class Context { 
     * @see android.nearby.NearbyManager

     * @hide

     */

    @SystemApi

    public static final String NEARBY_SERVICE = "nearby";



    /**