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 am: 57ce3e2203

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

Change-Id: I0d5479c8b6e7f20dbd430d119c0a33b121222e1a
This commit is contained in:
Remi NGUYEN VAN
2022-01-31 14:37:01 +00:00
committed by Automerger Merge Worker
parent b56bb8fa98 57ce3e2203
commit 932b4b9135
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

@@ -2001,6 +2001,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";

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

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