From 48f1bb60fbda9d57637b75760b44c806bf18ee6c Mon Sep 17 00:00:00 2001 From: Xinyi Zhou Date: Tue, 21 Dec 2021 16:48:49 -0800 Subject: [PATCH] Expose Conext.NEARBY_SERVICE as SystemApi (cherry-pick from downstream branch) Merged-In: Ie9fb547e166e6c881dfd04383050375a11f84a9b Test: Built successfully Bug: 189954300 Change-Id: I5ee56ddd84d38ee24b559fea278c263d424508ed --- core/api/system-current.txt | 1 + core/java/android/content/Context.java | 1 + 2 files changed, 2 insertions(+) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 61b4ada0c5dd..e7bca88d62e0 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -1994,6 +1994,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 f99352a9d328..30850e3ba06c 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -5785,6 +5785,7 @@ public abstract class Context { * @see android.nearby.NearbyManager * @hide */ + @SystemApi public static final String NEARBY_SERVICE = "nearby"; /**