Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I5ee56ddd,Ib9ef2a7b

Browse Source 
* changes:
  Expose Conext.NEARBY_SERVICE as SystemApi
  Add NearbyService
This commit is contained in:
Remi NGUYEN VAN
2022-01-31 13:46:21 +00:00
committed by Gerrit Code Review
parent ec7461850f 48f1bb60fb
commit 3789826e68
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -1995,6 +1995,7 @@ package android.content {
field public static final String HDMI_CONTROL_SERVICE = "hdmi_control"; 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 MEDIA_TRANSCODING_SERVICE = "media_transcoding";
field public static final String MUSIC_RECOGNITION_SERVICE = "music_recognition"; 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 NETD_SERVICE = "netd";
field public static final String NETWORK_SCORE_SERVICE = "network_score"; field public static final String NETWORK_SCORE_SERVICE = "network_score";
field public static final String OEM_LOCK_SERVICE = "oem_lock"; field public static final String OEM_LOCK_SERVICE = "oem_lock";

11
core/java/android/content/Context.java
View File

@@ -5777,6 +5777,17 @@ public abstract class Context {
*/ */
public static final String DISPLAY_HASH_SERVICE = "display_hash"; 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 * Determine whether the given permission is allowed for a particular
* process and user ID running in the system. * process and user ID running in the system.