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

Commit 3789826e authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Gerrit Code Review
Browse files

Merge changes I5ee56ddd,Ib9ef2a7b 

* changes:
  Expose Conext.NEARBY_SERVICE as SystemApi
  Add NearbyService
parents ec746185 48f1bb60

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1995,6 +1995,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 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

+11 −0
Original line number Diff line number Diff line
@@ -5777,6 +5777,17 @@ public abstract class Context { 
     */

    public static final String DISPLAY_HASH_SERVICE = "display_hash";



    /**

     * Use with {@link #getSystemService(String)} to retrieve a

     * {@link android.nearby.NearbyManager} to discover nearby devices.

     *

     * @see #getSystemService(String)

     * @see android.nearby.NearbyManager

     * @hide

     */

    @SystemApi

    public static final String NEARBY_SERVICE = "nearby";



    /**

     * Determine whether the given permission is allowed for a particular

     * process and user ID running in the system.