diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2021-03-19 02:32:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-19 02:32:00 +0000 |
| commit | 7e26e33269d388b35014a901a3ee6d6bea25b596 (patch) | |
| tree | befed04bb8df04e2d08e5414956032e2e9d95e84 | |
| parent | 25be9509b86200335bd14c9fe079293d650a2ae5 (diff) | |
| parent | 2bf4c58ceb753b1b0d13a84cd9d4265b5e41798a (diff) | |
Merge "Add TEST_NETWORK_SERVICE to module API"
| -rw-r--r-- | core/api/module-lib-current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index 4df72046340b..bd4c3011c67e 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -22,6 +22,10 @@ package android.app.usage { package android.content { + public abstract class Context { + field public static final String TEST_NETWORK_SERVICE = "test_network"; + } + public class Intent implements java.lang.Cloneable android.os.Parcelable { field public static final String ACTION_CLEAR_DNS_CACHE = "android.intent.action.CLEAR_DNS_CACHE"; } diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index aa6127904400..fe9ed27a516f 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -4099,7 +4099,8 @@ public abstract class Context { * @see #getSystemService(String) * @hide */ - @TestApi public static final String TEST_NETWORK_SERVICE = "test_network"; + @TestApi @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) + public static final String TEST_NETWORK_SERVICE = "test_network"; /** * Use with {@link #getSystemService(String)} to retrieve a {@link |