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

Merge changes I5ee56ddd,Ib9ef2a7b am: 3789826e68 am: 4973cc90d9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1966441

Change-Id: I209f5a3899e50a4bf69a1eebe1ac62e00ccb9f02
This commit is contained in:
Remi NGUYEN VAN
2022-01-31 14:21:33 +00:00
committed by Automerger Merge Worker
parent 54018f78e6 4973cc90d9
commit 57ce3e2203
2 changed files with 2 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 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";

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

@@ -5785,6 +5785,7 @@ public abstract class Context {
* @see android.nearby.NearbyManager
* @hide
*/
@SystemApi
public static final String NEARBY_SERVICE = "nearby";
/**