diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 59511510e467..7c8868e4e570 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -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"; diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 98e124d7e8f4..30850e3ba06c 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -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.