diff options
| author | 2023-10-25 06:15:34 +0000 | |
|---|---|---|
| committer | 2023-10-25 06:15:34 +0000 | |
| commit | 1ff7e3ba1224d17fe8156a4caab4b81e2874504d (patch) | |
| tree | 0ce39d924bf3f3d029d8149ddc66e48bb534a0b2 | |
| parent | 5265e4bd71d561d8332089f7ada51bfcfe89945d (diff) | |
| parent | c567a23d3a75315523fc1cc34940d6f341db2fa1 (diff) | |
Merge "[Thread] flagging the THREAD_NETWORK_SERVICE API" into main am: 55722bf523 am: c567a23d3a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2801853
Change-Id: Iddba1fc0c2d9ac9b628f7ae8ad746075bd02eb27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 64ea1ab0c826..b6c9678f6cae 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -3481,7 +3481,7 @@ package android.content { 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 public static final String THREAD_NETWORK_SERVICE = "thread_network"; + field @FlaggedApi("com.android.net.thread.flags.thread_enabled") 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"; field public static final String UI_TRANSLATION_SERVICE = "ui_translation"; diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index c1b082553537..95fc3ac623ca 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -23,6 +23,7 @@ import android.annotation.ColorInt; import android.annotation.ColorRes; import android.annotation.DisplayContext; import android.annotation.DrawableRes; +import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.LongDef; import android.annotation.NonNull; @@ -4766,6 +4767,7 @@ public abstract class Context { * @see android.net.thread.ThreadNetworkManager * @hide */ + @FlaggedApi("com.android.net.thread.flags.thread_enabled") @SystemApi public static final String THREAD_NETWORK_SERVICE = "thread_network"; |