diff options
| author | 2025-01-27 05:05:55 -0800 | |
|---|---|---|
| committer | 2025-01-27 05:05:55 -0800 | |
| commit | 42fee32ccbd2c9f7148fa8ed3936f30a9214cff3 (patch) | |
| tree | bdd3d512c3fabff79b700e5fff3b9a5be7df5317 | |
| parent | 820489dbcc51352e51df53cead9ef50cd101a3c1 (diff) | |
| parent | 43b304a20091b5f4970fc8148c283883116a7fea (diff) | |
Merge "Make Context#TETHERING_SERVICE public API" into main am: 43b304a200
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3464423
Change-Id: I5e2ce5d03e796932c81147f4bf27132f2871e25d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index ab2d8c3895e3..5acb9bff2841 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -10853,6 +10853,7 @@ package android.content { field public static final String TELEPHONY_IMS_SERVICE = "telephony_ims"; field public static final String TELEPHONY_SERVICE = "phone"; field public static final String TELEPHONY_SUBSCRIPTION_SERVICE = "telephony_subscription_service"; + field public static final String TETHERING_SERVICE = "tethering"; field public static final String TEXT_CLASSIFICATION_SERVICE = "textclassification"; field public static final String TEXT_SERVICES_MANAGER_SERVICE = "textservices"; field @FlaggedApi("android.media.tv.flags.enable_ad_service_fw") public static final String TV_AD_SERVICE = "tv_ad"; diff --git a/core/api/system-current.txt b/core/api/system-current.txt index a1c18eb20820..34d90007a681 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -3851,7 +3851,6 @@ package android.content { field public static final String STATS_MANAGER = "stats"; field public static final String SYSTEM_CONFIG_SERVICE = "system_config"; field public static final String SYSTEM_UPDATE_SERVICE = "system_update"; - field public static final String TETHERING_SERVICE = "tethering"; field @FlaggedApi("com.android.net.thread.platform.flags.thread_enabled_platform") public static final String THREAD_NETWORK_SERVICE = "thread_network"; field public static final String TIME_MANAGER_SERVICE = "time_manager"; field public static final String TRANSLATION_MANAGER_SERVICE = "translation"; diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 7e65439bb3c7..b60b1f82ae13 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -4894,10 +4894,10 @@ public abstract class Context { /** * Use with {@link #getSystemService(String)} to retrieve a {@link android.net.TetheringManager} * for managing tethering functions. - * @hide + * * @see android.net.TetheringManager */ - @SystemApi + @SuppressLint("UnflaggedApi") public static final String TETHERING_SERVICE = "tethering"; /** |